openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Move bootstrap password to an environment var" into stable/stein

This commit is contained in:
Zuul 2019-11-07 23:07:56 +00:00 committed by Gerrit Code Review
parent c882093db0 f29003fa18
commit 7437570652
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,8 +763,14 @@ 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', {get_param: AdminPassword} ]
[ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', '$$KEYSTONE_BOOTSTRAP_PASSWORD' ]
environment:
KEYSTONE_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
keystone_cron:
start_order: 4
image: *keystone_image