Increase corosync token timeout

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index fd12c34..5417623 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -82,9 +82,9 @@ if hiera('step') >= 1 {
   $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
   $corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
   if $corosync_ipv6 {
-    $cluster_setup_extras = { '--ipv6' => '' }
+    $cluster_setup_extras = { '--token' => hiera('corosync_token_timeout', 1000), '--ipv6' => '' }
   } else {
-    $cluster_setup_extras = {}
+    $cluster_setup_extras = { '--token' => hiera('corosync_token_timeout', 1000) }
   }
   class { '::pacemaker':
     hacluster_pwd => hiera('hacluster_pwd'),
@@ -185,8 +185,10 @@ if hiera('step') >= 1 {
       'bind-address'                  => $::hostname,
       'max_connections'               => hiera('mysql_max_connections'),
       'open_files_limit'              => '-1',
+      'wsrep_on'                      => 'ON',
       'wsrep_provider'                => '/usr/lib64/galera/libgalera_smm.so',
       'wsrep_cluster_name'            => 'galera_cluster',
+      'wsrep_cluster_address'         => "gcomm://${galera_nodes}",
       'wsrep_slave_threads'           => '1',
       'wsrep_certify_nonPK'           => '1',
       'wsrep_max_ws_rows'             => '131072',