summaryrefslogtreecommitdiffstats
path: root/tools/keystone/fetchpass.sh
diff options
context:
space:
mode:
authorDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-01-30 12:40:55 +0100
committerDimitri Mazmanov <dimitri.mazmanov@ericsson.com>2017-01-30 13:32:13 +0100
commit324e79bac3985fc3e2599c5d0567fec59a217418 (patch)
tree430d33a8f4f2c71ed67b20ad7b4b3432469588a0 /tools/keystone/fetchpass.sh
parent9f9356251d1e5d1812ac16859f8b6b6f20eeb8dd (diff)
Fix script execution on wrong target
All scripts are now triggered via run.sh which is a proxy to controllers and computes. Change-Id: Ifd35d5405d30b9aed002515e55a3b9047098a0d4 Signed-off-by: Dimitri Mazmanov <dimitri.mazmanov@ericsson.com> JIRA: MULTISITE-34
Diffstat (limited to 'tools/keystone/fetchpass.sh')
-rwxr-xr-xtools/keystone/fetchpass.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/keystone/fetchpass.sh b/tools/keystone/fetchpass.sh
index 50fdb5c..5d50aa6 100755
--- a/tools/keystone/fetchpass.sh
+++ b/tools/keystone/fetchpass.sh
@@ -24,10 +24,9 @@ AODH_CONF='/etc/aodh/aodh.conf'
source openrc
-# if running as part of Jenkins job, create the files in WORKSPACE
-WORKSPACE=${WORKSPACE:-/root}
-PASSWORD_FILE_ENC="${WORKSPACE}/servicepass.ini"
-PASSWORD_FILE="${WORKSPACE}/passwords.ini"
+# Always executed on controller
+PASSWORD_FILE_ENC="/root/servicepass.ini"
+PASSWORD_FILE="/root/passwords.ini"
# Get an option from an INI file
# iniget config-file section option