Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
controller/ha: disable keystone-manage bootstrap.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
EmilienM committed Mar 1, 2016
1 parent fef0191 commit f752e1f
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions puppet/manifests/overcloud_controller_pacemaker.pp
Expand Up @@ -506,9 +506,12 @@
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

Expand Down

0 comments on commit f752e1f

Please sign in to comment.