From 6f90cd8528abbcfeb1f9f8180ca048704b6ffed0 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 10 Dec 2019 15:08:43 -0700 Subject: [PATCH] Update environment var for keystone bootstrap Related-Bug: #1855932 Change-Id: I6907729bca667459466834276513e9f0233d10d0 Depends-On: https://review.opendev.org/#/c/698329 Depends-On: https://review.opendev.org/#/c/698480 --- deployment/keystone/keystone-container-puppet.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 589eddc844..b1ae2a78cc 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -655,15 +655,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