openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Update environment var for keystone bootstrap 

Related-Bug: #1855932

Change-Id: I6907729bca667459466834276513e9f0233d10d0
Depends-On: https://review.opendev.org/#/c/698929/
(cherry picked from commit 6f90cd8528)
This commit is contained in:
Alex Schultz 2019-12-10 15:08:43 -07:00
parent be1478581d
commit aa660ce845
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