From: ZhongShengping <chdzsp@163.com>
Date: Tue, 7 Jun 2016 02:10:06 +0000 (+0800)
Subject: Add purge_config option
X-Git-Tag: 9.1.0~10
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0b9bee9ffd94e9d98b192de6f31be2430aadf4f2;p=puppet-modules%2Fpuppet-ceilometer.git

Add purge_config option

Add the option in order to facilitate management.
User can ensure that only the options they hoped
are configured.

Change-Id: I149224f4035888e6bd2aca16c36af7ab9055a3a1
---

diff --git a/manifests/init.pp b/manifests/init.pp
index d81fc28..e0a8ff6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -216,6 +216,11 @@
 #   (Optional) Password for message broker authentication
 #   Defaults to $::os_service_default.
 #
+# [*purge_config*]
+#   (optional) Whether to set only the specified config options
+#   in the ceilometer config.
+#   Defaults to false.
+#
 # === DEPRECATED PARAMETERS:
 #  [*metering_secret*]
 #   (optional)  Secret key for signing messages.
@@ -276,6 +281,7 @@ class ceilometer(
   $amqp_sasl_config_name              = $::os_service_default,
   $amqp_username                      = $::os_service_default,
   $amqp_password                      = $::os_service_default,
+  $purge_config                       = false,
   # DEPRECATED PARAMETERS
   $alarm_history_time_to_live         = undef,
   $metering_secret                    = undef,
@@ -324,6 +330,10 @@ class ceilometer(
     tag    => ['openstack', 'ceilometer-package'],
   }
 
+  resources { 'ceilometer_config':
+    purge => $purge_config,
+  }
+
   # we keep "ceilometer.openstack.common.rpc.impl_kombu" for backward compatibility
   if $rpc_backend in [$::os_service_default, 'ceilometer.openstack.common.rpc.impl_kombu', 'rabbit'] {
     oslo::messaging::rabbit {'ceilometer_config':
diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb
index 18b61da..36af30d 100644
--- a/spec/classes/ceilometer_init_spec.rb
+++ b/spec/classes/ceilometer_init_spec.rb
@@ -12,6 +12,7 @@ describe 'ceilometer' do
       :debug                      => 'False',
       :log_dir                    => '/var/log/ceilometer',
       :use_stderr                 => 'True',
+      :purge_config               => false,
     }
   end
 
@@ -105,6 +106,12 @@ describe 'ceilometer' do
       )
     end
 
+    it 'passes purge to resource' do
+      is_expected.to contain_resources('ceilometer_config').with({
+        :purge => false
+      })
+    end
+
     it 'configures required telemetry_secret' do
       is_expected.to contain_ceilometer_config('publisher/telemetry_secret').with_value('metering-s3cr3t')
       is_expected.to contain_ceilometer_config('publisher/telemetry_secret').with_value( params[:telemetry_secret] ).with_secret(true)