summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-02-29 20:48:27 -0500
committerEmilien Macchi <emilien@redhat.com>2016-02-29 20:48:27 -0500
commitf752e1fe5301abdbf2e8405c595a05e08f0c609b (patch)
treeb9144a95f9eaab3968712dc0716511bce80203f1 /puppet
parentfef01919e67e59f2ba0dc9d5b1ec5567dc9daabf (diff)
controller/ha: disable keystone-manage bootstrap.
Because Overcloud Keystone resources are not managed by puppet-keystone but by os-cloud-config, we need to let os-cloud-config managing keystone bootstrap otherwise the Exec will fail since some data is already in place. Later, when Keystone resources will be managed by Puppet, drop this parameter, because puppet-keystone is able to manage the boostrap itself. Change-Id: I027deaae5cf90c27a6b5e9d236ae61145cab3c3f Closes-Bug: #1551501
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
1 files changed, 6 insertions, 3 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index c6c69b78..d44dc69c 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -506,9 +506,12 @@ MYSQL_HOST=localhost\n",
if hiera('step') >= 3 {
class { '::keystone':
- sync_db => $sync_db,
- manage_service => false,
- enabled => false,
+ 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,
}
include ::keystone::config