Use the purge_config flag to purge plugins/handlers/extensions/mutators

sensu · Jan 26, 2015 · c54d234 · c54d234
1 parent 5886615
commit c54d234
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 23 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -175,11 +175,6 @@
 #   Default: false
 #   Valid values: true, false
 #
-# [*purge_scripts*]
-#   Boolean.  If unused plugins, handlers, extensions and mutators should be removed from the system
-#   Default: false
-#   Valid values: true, false
-#
 # [*use_embedded_ruby*]
 #   Boolean.  If the embedded ruby should be used
 #   Default: false
@@ -239,15 +234,14 @@
   $plugins                  = [],
   $plugins_dir              = undef,
   $purge_config             = false,
-  $purge_scripts            = false,
   $use_embedded_ruby        = false,
   $rubyopt                  = '',
   $gem_path                 = '',
   $log_level                = 'info',
   $dashboard                = false,
 ){
 
-  validate_bool($client, $server, $api, $install_repo, $purge_config, $purge_scripts, $safe_mode, $manage_services)
+  validate_bool($client, $server, $api, $install_repo, $purge_config, $safe_mode, $manage_services)
 
   validate_re($repo, ['^main$', '^unstable$'], "Repo must be 'main' or 'unstable'.  Found: ${repo}")
   validate_re($version, ['^absent$', '^installed$', '^latest$', '^present$', '^[\d\.\-]+$'], "Invalid package version: ${version}")

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -76,7 +76,7 @@
     owner   => 'sensu',
     group   => 'sensu',
     recurse => true,
-    purge   => $sensu::purge_scripts,
+    purge   => $sensu::purge_config,
     require => Package['sensu'],
   }
 
@@ -87,7 +87,7 @@
       owner   => 'sensu',
       group   => 'sensu',
       recurse => true,
-      purge   => $sensu::purge_scripts,
+      purge   => $sensu::purge_config,
       require => Package['sensu'],
     }
   }

diff --git a/spec/classes/sensu_package_spec.rb b/spec/classes/sensu_package_spec.rb
@@ -8,18 +8,13 @@
       it { should create_class('sensu::package') }
       it { should contain_package('sensu').with_ensure('latest') }
       it { should contain_file('/etc/default/sensu') }
-      [ '/etc/sensu/conf.d', '/etc/sensu/conf.d/handlers', '/etc/sensu/conf.d/checks' ].each do |dir|
+      [ '/etc/sensu/conf.d', '/etc/sensu/conf.d/handlers', '/etc/sensu/conf.d/checks',
+        '/etc/sensu/handlers', '/etc/sensu/extensions', '/etc/sensu/mutators',
+        '/etc/sensu/extensions/handlers', '/etc/sensu/plugins'].each do |dir|
         it { should contain_file(dir).with(
           :ensure => 'directory',
-          :purge  => false
-        ) }
-      end
-      [ '/etc/sensu/handlers', '/etc/sensu/extensions', '/etc/sensu/mutators',
-        '/etc/sensu/extensions/handlers', '/etc/sensu/plugins' ].each do |dir|
-        it { should contain_file(dir).with(
-          :ensure  => 'directory',
           :recurse => true,
-          :purge   => false
+          :purge  => false
         ) }
       end
       it { should contain_file('/etc/sensu/config.json').with_ensure('absent') }
@@ -160,11 +155,6 @@
         ) }
       end
 
-    end
-
-    context 'purge_scripts' do
-      let(:params) { { :purge_scripts => true } }
-
       [ '/etc/sensu/handlers', '/etc/sensu/extensions', '/etc/sensu/mutators',
         '/etc/sensu/extensions/handlers', '/etc/sensu/plugins' ].each do |dir|
         it { should contain_file(dir).with(