diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-18 07:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-18 07:27:03 +0000 |
| commit | d99fde03e1641ebba51710161c202e9c3bdb4c31 (patch) | |
| tree | 01780a66c3a8061ce37e41cb14641cdcc8f3d0a0 /docker | |
| parent | dba0aee4d91e472c958e07f01a86b09ae6b0c45c (diff) | |
| parent | 556ea33076eba45864c691f7302067dc08892bfd (diff) | |
| download | kolla-d99fde03e1641ebba51710161c202e9c3bdb4c31.tar.gz kolla-d99fde03e1641ebba51710161c202e9c3bdb4c31.zip | |
Merge "Do not require the bootstrap password to come in via arguments"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone/keystone_bootstrap.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index 1c822d0d6..f5ade84d5 100644 --- a/docker/keystone/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone/keystone_bootstrap.sh @@ -9,6 +9,11 @@ set -x USERNAME=$1 PASSWORD=$2 +if [ -z "$PASSWORD" ]; then + # Avoid having the password always come in via CLI (which makes + # it show up in things like ara) + PASSWORD="$OS_BOOTSTRAP_PASSWORD" +fi PROJECT=$3 ROLE=$4 ADMIN_URL=$5 |