stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Run openstack-ceilometer-central with Pacemaker/Systemd

Browse Source 
The resource agent is not working properly on RHEL plateforms because of
systemd.
For now, let's use systemd resource in Pacemaker.
Later, we will refactore all Pacemaker usage to have something
Puppetish.

The idea is for now to close the bug and drop a blocker to deploye this
service.

Closes-bug: #1403131

Change-Id: Ia694c2c460db882ba2f82aedad55c1a77691397f
This commit is contained in:
Emilien Macchi 2014-12-16 14:51:14 -05:00
parent a1924ec52f
commit 1c7669921a
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/spof.pp
View File

@ -66,18 +66,7 @@ class cloud::spof(
class {'pacemaker::stonith':
disable => true
}
file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central':
source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central',
mode => '0755',
owner => 'root',
group => 'root',
} ->
exec {'pcmk_ceilometer_agent_central':
command => 'pcs resource create ceilometer-agent-central ocf:heartbeat:ceilometer-agent-central',
path => ['/usr/bin','/usr/sbin','/sbin/','/bin'],
user => 'root',
unless => '/usr/sbin/pcs resource | /bin/grep ceilometer-agent-central | /bin/grep Started'
}
pacemaker::resource::systemd { 'openstack-ceilometer-central': }
} else {
class { 'corosync':

13
spec/classes/cloud_spof_spec.rb
View File

@ -73,18 +73,7 @@ describe 'cloud::spof' do
:settle_try_sleep => 5,
:manage_fw => false,
:cluster_members => 'srv1 srv2 srv3')
is_expected.to contain_file('/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central').with(
:source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central',
:mode => '0755',
:owner => 'root',
:group => 'root'
)
is_expected.to contain_exec('pcmk_ceilometer_agent_central').with(
:command => 'pcs resource create ceilometer-agent-central ocf:heartbeat:ceilometer-agent-central',
:path => ['/usr/bin','/usr/sbin','/sbin/','/bin'],
:user => 'root',
:unless => '/usr/sbin/pcs resource | /bin/grep ceilometer-agent-central | /bin/grep Started'
)
is_expected.to contain_pcmk_resource('openstack-ceilometer-central')
is_expected.to contain_class('cloud::telemetry::centralagent').with(:enabled => false)
end
end