openstack
/
tripleo-heat-templates
Code Issues Proposed changes

[train-squash] Backport keystone/bootstrap changes 

Configure additional info during bootstrap

Keystone bootstrap can also be passed with additional endpoint
information. This will populate the initial catalog.

Change-Id: I3e9c1df82b4dfc94253688038215a66ded365a95
(cherry picked from commit eeec9a52ee)

keystone/bootstrap: fix identity service name

Service name for bootstrap should be named 'keystone' to match with what
Puppet creates, so we don't end up with multiple 'identity' services and
endpoints.

Change-Id: I9dc5bbd4de28e92e2b6161eb12cb92680f4363bd
(cherry picked from commit 32d3676e5f)
This commit is contained in:
Alex Schultz 2019-12-06 13:08:36 -07:00 committed by Emilien Macchi
parent 8316a6142b
commit 2f9a570fbc
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/keystone/keystone-container-puppet.yaml
View File

@ -632,6 +632,14 @@ outputs:
environment:
KOLLA_BOOTSTRAP: true
OS_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
OS_BOOTSTRAP_USERNAME: 'admin'
OS_BOOTSTRAP_PROJECT_NAME: 'admin'
OS_BOOTSTRAP_ROLE_NAME: 'admin'
OS_BOOTSTRAP_SERVICE_NAME: 'keystone'
OS_BOOTSTRAP_ADMIN_URL: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
OS_BOOTSTRAP_PUBLIC_URL: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
OS_BOOTSTRAP_INTERNAL_URL: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
OS_BOOTSTRAP_REGION_ID: {get_param: KeystoneRegion}
step_4:
# There are cases where we need to refresh keystone after the resource provisioning,
# such as the case of using LDAP backends for domains. So we trigger a graceful