From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 31 May 2016 20:07:35 +0000 (+0000)
Subject: Merge "Revert "Deprecate use_syslog""
X-Git-Tag: 9.0.0~3
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=67b1d25e1757788bf0f3f6856ce7b603a88d413d;p=puppet-modules%2Fpuppet-ceilometer.git

Merge "Revert "Deprecate use_syslog""
---

67b1d25e1757788bf0f3f6856ce7b603a88d413d
diff --cc manifests/init.pp
index 8498bac,97685eb..d81fc28
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -237,10 -224,9 +236,11 @@@ class ceilometer
    $package_ensure                     = 'present',
    $debug                              = undef,
    $log_dir                            = undef,
+   $use_syslog                         = undef,
    $use_stderr                         = undef,
    $log_facility                       = undef,
 +  $default_transport_url              = $::os_service_default,
 +  $notification_transport_url         = $::os_service_default,
    $rpc_backend                        = $::os_service_default,
    $rabbit_host                        = $::os_service_default,
    $rabbit_port                        = $::os_service_default,