Quellcode durchsuchen

Move bootstrap password to an environment var

Currently if you try to use a space in the keystone password, the
bootstrap process fails due to the password being evaulated as command
line arguments. We can work around this by using an environment var to
pass the password to the script that needs to be run.

Conflicts:
        puppet/services/keystone.yaml

Change-Id: I03754206781bc8f62d143b2c541f594ca3207a0f
Closes-Bug: #1811005
(cherry picked from commit 068527d139)
changes/93/693193/1
Alex Schultz vor 5 Monaten
Ursprung
Commit
669f602604
1 geänderte Dateien mit 7 neuen und 1 gelöschten Zeilen
  1. +7
    -1
      docker/services/keystone.yaml

+ 7
- 1
docker/services/keystone.yaml Datei anzeigen

@@ -173,8 +173,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


Laden…
Abbrechen
Speichern