aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-28 11:37:37 +0000
committerGerrit Code Review <review@openstack.org>2015-05-28 11:37:37 +0000
commit48908b744c6cd47eefaee631a7ecce63f75e9958 (patch)
tree538b081764258cb08b38ecb112e59caa126fc56e /puppet/manifests
parenta2e6eb9f06c03f1150bfe9cfbb978cca60b75c5c (diff)
parenta5b7b85cf8d080d890f67ba84454e68212eb8ac7 (diff)
Merge "Use the proper parameter to set --master"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
1 files changed, 2 insertions, 1 deletions
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'],