summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller_pacemaker.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-09 11:26:03 +0000
committerGerrit Code Review <review@openstack.org>2015-10-09 11:26:03 +0000
commit57f7dd6d7f9f6346e85d0f79b88462429db7a782 (patch)
tree39c1d7ae6b17d9ec36993764f9aa263c55bc7753 /puppet/manifests/overcloud_controller_pacemaker.pp
parent2089e841a0df746ad94c92ca7ed4aba953353094 (diff)
parent7a5262fbb97f1759ba74e0897f9e5c6e4e61269d (diff)
Merge "Fix MariaDB account removal race condition"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp13
1 files changed, 7 insertions, 6 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 0c73dd2f..f5a89582 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -158,12 +158,13 @@ if hiera('step') >= 1 {
}
class { '::mysql::server':
- create_root_user => false,
- create_root_my_cnf => false,
- config_file => $mysql_config_file,
- override_options => $mysqld_options,
- service_manage => false,
- service_enabled => false,
+ create_root_user => false,
+ create_root_my_cnf => false,
+ config_file => $mysql_config_file,
+ override_options => $mysqld_options,
+ remove_default_accounts => $pacemaker_master,
+ service_manage => false,
+ service_enabled => false,
}
}