summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-03-04 14:54:51 +0100
committerJiri Stransky <jistr@redhat.com>2016-03-04 15:45:38 +0100
commit32185f750e84fddd64405f6abbb664492ed6f6d9 (patch)
treeb50009bcc4ca40462d0b2f8615527b3a9678254c /puppet/manifests
parent6be32543479589dedcae7502e6fe2167efeda710 (diff)
Run keystone-manage bootstrap for HA deployment too
This is necessary to keep creating the Default domain. Change-Id: Ib9911819e89f30270d4f7597639b33f30ad2e3a6 Closes-Bug: #1549867
Diffstat (limited to 'puppet/manifests')
-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