Add hasrestart & hasstatus to service management.

manifests/api/service.pp

@@ -22,9 +22,10 @@
     }
 
     service { 'sensu-api':
-      ensure    => $ensure,
-      enable    => $enable,
-      subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'] ]
+      ensure     => $ensure,
+      enable     => $enable,
+      hasrestart => true,
+      subscribe  => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'] ]
     }
   }
 }

manifests/client/service.pp

@@ -23,9 +23,10 @@
     }
 
     service { 'sensu-client':
-      ensure    => $ensure,
-      enable    => $enable,
-      subscribe => [Class['sensu::package'], Class['sensu::client::config'], Class['sensu::rabbitmq::config'] ],
+      ensure     => $ensure,
+      enable     => $enable,
+      hasrestart => true,
+      subscribe  => [Class['sensu::package'], Class['sensu::client::config'], Class['sensu::rabbitmq::config'] ],
     }
   }
 }

manifests/dashboard/service.pp

@@ -22,9 +22,10 @@
     }
 
     service { 'sensu-dashboard':
-      ensure    => $ensure,
-      enable    => $enable,
-      subscribe => [ Class['sensu::package'], Class['sensu::dashboard::config'], Class['sensu::api::config'], Class['sensu::redis::config'] ]
+      ensure     => $ensure,
+      enable     => $enable,
+      hasrestart => true,
+      subscribe  => [ Class['sensu::package'], Class['sensu::dashboard::config'], Class['sensu::api::config'], Class['sensu::redis::config'] ]
     }
   }
 }

manifests/handler.pp

@@ -101,7 +101,7 @@
 
   if $source {
 
-    $filename = inline_template("<%= scope.lookupvar('source').split('/').last %>")
+    $filename = inline_template('<%= scope.lookupvar(\'source\').split(\'/\').last %>')
     $command_real = "${install_path}/${filename}"
 
     $file_ensure = $ensure ? {

manifests/plugin.pp

@@ -47,7 +47,7 @@
 
   case $type {
     'file':       {
-      $filename = inline_template("<%= scope.lookupvar('name').split('/').last %>")
+      $filename = inline_template('<%= scope.lookupvar(\'name\').split(\'/\').last %>')
 
       file { "${install_path}/${filename}":
         ensure  => file,

manifests/server/service.pp

@@ -22,9 +22,10 @@
     }
 
     service { 'sensu-server':
-      ensure    => $ensure,
-      enable    => $enable,
-      subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'], Class['sensu::rabbitmq::config'] ],
+      ensure     => $ensure,
+      enable     => $enable,
+      hasrestart => true,
+      subscribe  => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'], Class['sensu::rabbitmq::config'] ],
     }
   }
 }

spec/classes/sensu_api_spec.rb

@@ -32,8 +32,9 @@
 
     context 'managing services' do
       it { should contain_service('sensu-api').with(
-        :ensure => 'stopped',
-        :enable => false
+        :ensure     => 'stopped',
+        :enable     => false,
+        :hasrestart => true
       )}
     end # managing services
 
@@ -111,8 +112,9 @@
       context 'managing services' do
         let(:params) { { :api => true } }
         it { should contain_service('sensu-api').with(
-          :ensure => 'running',
-          :enable => true
+          :ensure     => 'running',
+          :enable     => true,
+          :hasrestart => true
         )}
       end # managing services
 

spec/classes/sensu_client_spec.rb

@@ -53,8 +53,9 @@
       context 'default' do
         let(:params) { { :client => true } }
         it { should contain_service('sensu-client').with(
-          :ensure => 'running',
-          :enable => true
+          :ensure     => 'running',
+          :enable     => true,
+          :hasrestart => true
         ) }
       end # default
 
@@ -85,8 +86,9 @@
       context 'managing services' do
         let(:params) { { :client => false } }
         it { should contain_service('sensu-client').with(
-          :ensure => 'stopped',
-          :enable => false
+          :ensure     => 'stopped',
+          :enable     => false,
+          :hasrestart => true
         ) }
       end # managing services
 

spec/classes/sensu_dashboard_spec.rb

@@ -6,8 +6,9 @@
 
     context 'managing services' do
       it { should contain_service('sensu-dashboard').with(
-        :ensure => 'stopped',
-        :enable => false
+        :ensure     => 'stopped',
+        :enable     => false,
+        :hasrestart => true
       )}
     end # managing services
 
@@ -21,7 +22,7 @@
         :purge_config => true,
         :server       => false,
         :api          => false,
-        :dashboard    => false
+        :dashboard    => false,
       } }
 
       it { should contain_file('/etc/sensu/conf.d/dashboard.json').with_ensure('absent') }
@@ -79,8 +80,9 @@
       context 'managing services' do
         let(:params) { { :dashboard => true } }
         it { should contain_service('sensu-dashboard').with(
-          :ensure => 'running',
-          :enable => true
+          :ensure     => 'running',
+          :enable     => true,
+          :hasrestart => true
         )}
       end # managing services
 

spec/classes/sensu_server_spec.rb

@@ -6,17 +6,19 @@
   context 'without server (default)' do
 
     it { should contain_service('sensu-server').with(
-      :ensure => 'stopped',
-      :enable => false
+      :ensure     => 'stopped',
+      :enable     => false,
+      :hasrestart => true
     ) }
   end # without server
 
   context 'with server' do
     let(:params) { { :server => true } }
 
     it { should contain_service('sensu-server').with(
-      :ensure => 'running',
-      :enable => true
+      :ensure     => 'running',
+      :enable     => true,
+      :hasrestart => true
     ) }
   end # with server