openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-12-24 00:48:47 +00:00 committed by Gerrit Code Review
parent b11407fbf3 aa660ce845
commit 61688872a7
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

@ -763,14 +763,10 @@ outputs:
start_order: 3 start_order: 3
action: exec action: exec
user: root 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: 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: environment:
KEYSTONE_BOOTSTRAP_PASSWORD: {get_param: AdminPassword} OS_BOOTSTRAP_PASSWORD: {get_param: AdminPassword}
keystone_cron: keystone_cron:
start_order: 4 start_order: 4
image: *keystone_image image: *keystone_image