From: Jiri Stransky <jistr@redhat.com>
Date: Fri, 4 Mar 2016 13:54:51 +0000 (+0100)
Subject: Run keystone-manage bootstrap for HA deployment too
X-Git-Tag: opnfv-6.0.0~2136^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=32185f750e84fddd64405f6abbb664492ed6f6d9;p=apex-tripleo-heat-templates.git

Run keystone-manage bootstrap for HA deployment too

This is necessary to keep creating the Default domain.

Change-Id: Ib9911819e89f30270d4f7597639b33f30ad2e3a6
Closes-Bug: #1549867
---

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