openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use the proper parameter to set --master"

This commit is contained in:
Jenkins 2015-05-28 11:37:37 +00:00 committed by Gerrit Code Review
parent a2e6eb9f06 a5b7b85cf8
commit 48908b744c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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'],