openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Update environment var for keystone bootstrap" into stable/train

This commit is contained in:
Zuul 2019-12-20 03:58:05 +00:00 committed by Gerrit Code Review
parent 7aff0b2cc9 58521422fc
commit 06f5b9bd0b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,15 +657,11 @@ outputs:
start_order: 3
action: exec
user: root
# NOTE(mwhahaha): We use $$ because we're executing in python to
# call as shell script and passing the command to run as arguments
# to that shell script. So when it is called via eval, the escaped
# $ properly evaulates
command:
[ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', '$$KEYSTONE_BOOTSTRAP_PASSWORD' ]
[ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap' ]
environment:
KOLLA_BOOTSTRAP: true
KEYSTONE_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
OS_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
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