Merge pull request #18 from sensu/enterprise-reload

Use reload of sensu-enterprise service rather than restart
sensu · Aug 20, 2019 · a9f4449 · a9f4449
2 parents 8992cab + 88af9d1
commit a9f4449
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/manifests/enterprise.pp b/manifests/enterprise.pp
@@ -95,6 +95,13 @@
           Class['sensuclassic::package'],
         ],
       }
+
+      exec { 'sensu-enterprise-reload':
+        path        => '/usr/bin:/bin:/usr/sbin:/sbin',
+        command     => 'service sensu-enterprise reload',
+        refreshonly => true,
+        require     => Service['sensu-enterprise'],
+      }
     }
   }
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -586,7 +586,7 @@
   }
 
   if $enterprise and $manage_services {
-    $enterprise_service = Service['sensu-enterprise']
+    $enterprise_service = Exec['sensu-enterprise-reload']
   } else {
     $enterprise_service = undef
   }

diff --git a/spec/classes/sensuclassic_enterprise_spec.rb b/spec/classes/sensuclassic_enterprise_spec.rb
@@ -30,6 +30,7 @@
           it { should contain_service('sensu-enterprise').that_subscribes_to('Class[sensuclassic::redis::config]') }
           it { should contain_service('sensu-enterprise').that_subscribes_to('Class[sensuclassic::rabbitmq::config]') }
           it { should contain_service('sensu-enterprise').that_subscribes_to('Class[sensuclassic::package]') }
+          it { should contain_exec('sensu-enterprise-reload').with_command('service sensu-enterprise reload') }
           it { should_not contain_yumrepo('sensu-enterprise-dashboard') }
           it { should contain_package('sensu-enterprise') }
 
@@ -249,6 +250,7 @@
           } }
           it { should contain_yumrepo('sensu-enterprise') }
           it { should contain_service('sensu-enterprise') }
+          it { should contain_exec('sensu-enterprise-reload') }
           it { should_not contain_yumrepo('sensu-enterprise-dashboard') }
           it { should_not contain_service('sensu-enterprise-dashboard') }
         end

diff --git a/spec/defines/sensuclassic_check_spec.rb b/spec/defines/sensuclassic_check_spec.rb
@@ -249,6 +249,11 @@
       let(:pre_condition) { 'class {"sensuclassic": client => true, api => true, server => true}' }
       it { should contain_sensuclassic__write_json(fpath).with(:notify_list => ['Service[sensu-client]', 'Class[Sensuclassic::Server::Service]', 'Service[sensu-api]']) }
     end
+
+    context 'client and enterprise' do
+      let(:pre_condition) { 'class {"sensuclassic": enterprise => true, enterprise_user => "sensu", enterprise_pass => "sensu"}' }
+      it { should contain_sensuclassic__write_json(fpath).with(:notify_list => ['Service[sensu-client]', 'Exec[sensu-enterprise-reload]']) }
+    end
   end
 
   context 'with subdue' do