From 556ea33076eba45864c691f7302067dc08892bfd Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Mon, 26 Mar 2018 17:03:33 -0700 Subject: [PATCH] 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 --- docker/keystone/keystone/keystone_bootstrap.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index 1c822d0d67..f5ade84d55 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