stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Pacemaker / Red Hat: fix settle exec with lower timeout

Browse Source 
Decrease the exec timeout for settle our Pacemaker cluster and avoid
waiting 1 hour...
Also work on a dev-branch while the pull-request has been merged.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-07-01 11:12:16 +02:00
parent c6a7f7b486
commit 465d41cd7f
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.fixtures.yml
View File

@@ -47,7 +47,7 @@ fixtures:
ref: '6540b31b0ca0727094ddf44436274436d2853d6d' ref: '6540b31b0ca0727094ddf44436274436d2853d6d'
'pacemaker': 'pacemaker':
repo: 'git://github.com/enovance/puppet-pacemaker.git' repo: 'git://github.com/enovance/puppet-pacemaker.git'
ref: '3e64c61c205376885ba537fb3c0d37ced0fb53ac' ref: 'a2949b62b5308e0edaa3063295ddb2b78fa975eb'
'elasticsearch': 'elasticsearch':
repo: 'git://github.com/enovance/puppet-elasticsearch.git' repo: 'git://github.com/enovance/puppet-elasticsearch.git'
ref: '042720d52a3879786c2f9d9f67961c4f42004fae' ref: '042720d52a3879786c2f9d9f67961c4f42004fae'

2
Puppetfile
View File

@@ -115,7 +115,7 @@ mod 'ntp',
:ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d' :ref => 'eb02ba2937ce86fb609ae41499767244b78ec58d'
mod 'pacemaker', mod 'pacemaker',
:git => 'git://github.com/enovance/puppet-pacemaker.git', :git => 'git://github.com/enovance/puppet-pacemaker.git',
:ref => '7e304243b5bd2dced5f54d5146ecc58d0b5a51f1' :ref => 'a2949b62b5308e0edaa3063295ddb2b78fa975eb'
mod 'rabbitmq', mod 'rabbitmq',
:git => 'git://github.com/enovance/puppetlabs-rabbitmq.git', :git => 'git://github.com/enovance/puppetlabs-rabbitmq.git',
:ref => '25420cb3c26c9a8432ab519d43c094d614d4fec4' :ref => '25420cb3c26c9a8432ab519d43c094d614d4fec4'

14
manifests/spof.pp
View File

@@ -46,15 +46,17 @@ class cloud::spof(
class { 'pacemaker': class { 'pacemaker':
hacluster_pwd => $cluster_password hacluster_pwd => $cluster_password
} }
class { 'pacemaker::corosync': class { 'pacemaker::corosync':
cluster_name => 'openstack', cluster_name => 'openstack',
cluster_members => $cluster_members cluster_members => $cluster_members,
settle_timeout => 10,
settle_tries => 2,
settle_try_sleep => 5,
manage_fw => false
} }
class {'pacemaker::stonith': class {'pacemaker::stonith':
disable => true disable => true
} -> }
file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central': file { '/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central':
source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central', source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central',
mode => '0755', mode => '0755',
@@ -66,7 +68,7 @@ class cloud::spof(
path => ['/usr/bin','/usr/sbin','/sbin/','/bin'], path => ['/usr/bin','/usr/sbin','/sbin/','/bin'],
user => 'root', user => 'root',
unless => '/usr/sbin/pcs resource | /bin/grep ceilometer-agent-central | /bin/grep Started' unless => '/usr/sbin/pcs resource | /bin/grep ceilometer-agent-central | /bin/grep Started'
} } ->
file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine': file { '/usr/lib/ocf/resource.d/heartbeat/heat-engine':
source => 'puppet:///modules/cloud/heartbeat/heat-engine', source => 'puppet:///modules/cloud/heartbeat/heat-engine',
mode => '0755', mode => '0755',

8
spec/classes/cloud_spof_spec.rb
View File

@@ -68,8 +68,12 @@ describe 'cloud::spof' do
should contain_class('pacemaker').with(:hacluster_pwd => 'verysecrete') should contain_class('pacemaker').with(:hacluster_pwd => 'verysecrete')
should contain_class('pacemaker::stonith').with(:disable => true) should contain_class('pacemaker::stonith').with(:disable => true)
should contain_class('pacemaker::corosync').with( should contain_class('pacemaker::corosync').with(
:cluster_name => 'openstack', :cluster_name => 'openstack',
:cluster_members => 'srv1 srv2 srv3') :settle_timeout => 10,
:settle_tries => 2,
:settle_try_sleep => 5,
:manage_fw => false,
:cluster_members => 'srv1 srv2 srv3')
should contain_file('/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central').with( should contain_file('/usr/lib/ocf/resource.d/heartbeat/ceilometer-agent-central').with(
:source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central', :source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central',
:mode => '0755', :mode => '0755',