Pacemaker / Red Hat: fix settle exec with lower timeout

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>

.fixtures.yml

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

Puppetfile

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

manifests/spof.pp

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

spec/classes/cloud_spof_spec.rb

@@ -68,8 +68,12 @@ describe 'cloud::spof' do
         should contain_class('pacemaker').with(:hacluster_pwd => 'verysecrete')
         should contain_class('pacemaker::stonith').with(:disable => true)
         should contain_class('pacemaker::corosync').with(
-          :cluster_name    => 'openstack',
-          :cluster_members => 'srv1 srv2 srv3')
+          :cluster_name     => 'openstack',
+          :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(
           :source => 'puppet:///modules/cloud/heartbeat/ceilometer-agent-central',
           :mode   => '0755',