summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-04 17:57:21 +0000
committerGerrit Code Review <review@openstack.org>2016-03-04 17:57:21 +0000
commitac9a848b803874203b0d974a26405afd1e980076 (patch)
treef74148fd26922a703d41ab11a8c29ea22c6a899c /puppet
parentb2c11d0cf8494c64cd53a4d2d9345da260bb66f4 (diff)
parent32185f750e84fddd64405f6abbb664492ed6f6d9 (diff)
Merge "Run keystone-manage bootstrap for HA deployment too"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index edeaa61a..fb36893d 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -509,9 +509,7 @@ if hiera('step') >= 3 {
sync_db => $sync_db,
manage_service => false,
enabled => false,
- # TODO: when keystone resources will be managed by puppet-keystone
- # for the overcloud, set enable_bootstrap to the default value (True).
- enable_bootstrap => false,
+ enable_bootstrap => $pacemaker_master,
}
include ::keystone::config