diff options
| author | Joshua Harlow <jxharlow@godaddy.com> | 2018-03-26 17:03:33 -0700 |
|---|---|---|
| committer | Joshua Harlow <jxharlow@godaddy.com> | 2018-03-26 17:03:34 -0700 |
| commit | 556ea33076eba45864c691f7302067dc08892bfd (patch) | |
| tree | 1dda3a49574921c850fcd8a46cf2acbbad3cbe06 | |
| parent | 04924d488fd0f84e3479e2b6f8af99c399563881 (diff) | |
| download | kolla-556ea33076eba45864c691f7302067dc08892bfd.tar.gz kolla-556ea33076eba45864c691f7302067dc08892bfd.zip | |
Do not require the bootstrap password to come in via arguments
Currently when this is being ran, and say ara is being used to
capture the running of kolla-ansible ara will capture the full
command line ran (even if no_log is set); because by default these
modules do not hide what they are running.
So to avoid the situation where the command line shows the password
have this also be able to take in the password via an environment
variable as well (which ara will not capture).
Change-Id: I4d42d592d8031d0f3923bccc6b2db1149af08e75
| -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 |