From ecefc8a52c3673df5d2d2ff1c3ff5929e889e804 Mon Sep 17 00:00:00 2001 From: rhoml Date: Mon, 24 Feb 2014 23:22:54 +0100 Subject: [PATCH] Removes hasstatus --- manifests/api/service.pp | 1 - manifests/client/service.pp | 1 - manifests/dashboard/service.pp | 1 - manifests/server/service.pp | 1 - spec/classes/sensu_api_spec.rb | 2 -- spec/classes/sensu_client_spec.rb | 2 -- spec/classes/sensu_dashboard_spec.rb | 2 -- spec/classes/sensu_server_spec.rb | 2 -- 8 files changed, 12 deletions(-) diff --git a/manifests/api/service.pp b/manifests/api/service.pp index dac11b5034..343d2e3adf 100644 --- a/manifests/api/service.pp +++ b/manifests/api/service.pp @@ -24,7 +24,6 @@ service { 'sensu-api': ensure => $ensure, enable => $enable, - hasstatus => true, hasrestart => true, subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'] ] } diff --git a/manifests/client/service.pp b/manifests/client/service.pp index 86d5e292eb..4aec6c7b33 100644 --- a/manifests/client/service.pp +++ b/manifests/client/service.pp @@ -25,7 +25,6 @@ service { 'sensu-client': ensure => $ensure, enable => $enable, - hasstatus => true, hasrestart => true, subscribe => [Class['sensu::package'], Class['sensu::client::config'], Class['sensu::rabbitmq::config'] ], } diff --git a/manifests/dashboard/service.pp b/manifests/dashboard/service.pp index 43e6fd796b..5ae0e823f9 100644 --- a/manifests/dashboard/service.pp +++ b/manifests/dashboard/service.pp @@ -24,7 +24,6 @@ service { 'sensu-dashboard': ensure => $ensure, enable => $enable, - hasstatus => true, hasrestart => true, subscribe => [ Class['sensu::package'], Class['sensu::dashboard::config'], Class['sensu::api::config'], Class['sensu::redis::config'] ] } diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 8f456e80d1..d98b392f54 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -24,7 +24,6 @@ service { 'sensu-server': ensure => $ensure, enable => $enable, - hasstatus => true, hasrestart => true, subscribe => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'], Class['sensu::rabbitmq::config'] ], } diff --git a/spec/classes/sensu_api_spec.rb b/spec/classes/sensu_api_spec.rb index b06b2debfd..e191c9a455 100644 --- a/spec/classes/sensu_api_spec.rb +++ b/spec/classes/sensu_api_spec.rb @@ -34,7 +34,6 @@ it { should contain_service('sensu-api').with( :ensure => 'stopped', :enable => false, - :hasstatus => true, :hasrestart => true, )} end # managing services @@ -115,7 +114,6 @@ it { should contain_service('sensu-api').with( :ensure => 'running', :enable => true, - :hasstatus => true, :hasrestart => true, )} end # managing services diff --git a/spec/classes/sensu_client_spec.rb b/spec/classes/sensu_client_spec.rb index ba7242a16a..f48dfc280e 100644 --- a/spec/classes/sensu_client_spec.rb +++ b/spec/classes/sensu_client_spec.rb @@ -55,7 +55,6 @@ it { should contain_service('sensu-client').with( :ensure => 'running', :enable => true, - :hasstatus => true, :hasrestart => true, ) } end # default @@ -89,7 +88,6 @@ it { should contain_service('sensu-client').with( :ensure => 'stopped', :enable => false, - :hasstatus => true, :hasrestart => true, ) } end # managing services diff --git a/spec/classes/sensu_dashboard_spec.rb b/spec/classes/sensu_dashboard_spec.rb index eb46b432fe..a744c7c61a 100644 --- a/spec/classes/sensu_dashboard_spec.rb +++ b/spec/classes/sensu_dashboard_spec.rb @@ -8,7 +8,6 @@ it { should contain_service('sensu-dashboard').with( :ensure => 'stopped', :enable => false, - :hasstatus => true, :hasrestart => true, )} end # managing services @@ -83,7 +82,6 @@ it { should contain_service('sensu-dashboard').with( :ensure => 'running', :enable => true, - :hasstatus => true, :hasrestart => true, )} end # managing services diff --git a/spec/classes/sensu_server_spec.rb b/spec/classes/sensu_server_spec.rb index 4e1ab1a6c8..c1b8b6e0ee 100644 --- a/spec/classes/sensu_server_spec.rb +++ b/spec/classes/sensu_server_spec.rb @@ -8,7 +8,6 @@ it { should contain_service('sensu-server').with( :ensure => 'stopped', :enable => false, - :hasstatus => true, :hasrestart => true, ) } end # without server @@ -19,7 +18,6 @@ it { should contain_service('sensu-server').with( :ensure => 'running', :enable => true, - :hasstatus => true, :hasrestart => true, ) } end # with server