stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #586 from enovance/bug/174/emilienm

Browse Source 
spof/debian: cleanup corosync resources if not started
This commit is contained in:
Yanis Guenane 2014-08-21 12:14:50 -04:00
commit 9a23dd7c30
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/spof.pp
View File

@ -111,6 +111,12 @@ class cloud::spof(
on-fail => 'restart' on-fail => 'restart'
} }
} }
} ->
exec { 'cleanup_ceilometer_agent_central':
command => 'crm resource cleanup ceilometer-agent-central',
unless => 'crm resource show ceilometer-agent-central | grep Started',
user => 'root',
path => ['/usr/sbin', '/bin'],
} }
} }

6
spec/classes/cloud_spof_spec.rb
View File

@ -48,6 +48,12 @@ describe 'cloud::spof' do
:group => 'root' :group => 'root'
) )
should contain_class('cloud::telemetry::centralagent').with(:enabled => false) should contain_class('cloud::telemetry::centralagent').with(:enabled => false)
should contain_exec('cleanup_ceilometer_agent_central').with(
:command => 'crm resource cleanup ceilometer-agent-central',
:path => ['/usr/sbin', '/bin'],
:user => 'root',
:unless => 'crm resource show ceilometer-agent-central | grep Started'
)
end end
end end