From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Wed, 27 May 2015 12:46:19 +0000 (+0200)
Subject: Use the proper parameter to set --master
X-Git-Tag: opnfv-6.0.0~2534^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a5b7b85cf8d080d890f67ba84454e68212eb8ac7;p=apex-tripleo-heat-templates.git

Use the proper parameter to set --master

The interface for pcmk_resource offers the parameter master_params to set
--master during the resource creation.

Change-Id: I6fa769f14a6248b371810af3ba6819a1f9ed9442
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a7aa40cb..b496e3c9 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -202,7 +202,8 @@ if hiera('step') >= 2 {
 
     pacemaker::resource::ocf { 'galera' :
       ocf_agent_name  => 'heartbeat:galera',
-      op_params       => 'promote timeout=300s on-fail=block --master',
+      op_params       => 'promote timeout=300s on-fail=block',
+      master_params   => '',
       meta_params     => "master-max=${galera_nodes_count} ordered=true",
       resource_params => "additional_parameters='--open-files-limit=16384' enable_creation=true wsrep_cluster_address='gcomm://${galera_nodes}'",
       require         => Class['::mysql::server'],