summaryrefslogtreecommitdiffstats
path: root/tools/keystone/writepass.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/writepass.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/writepass.sh')
-rwxr-xr-xtools/keystone/writepass.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/keystone/writepass.sh b/tools/keystone/writepass.sh
index d125854..466cd48 100755
--- a/tools/keystone/writepass.sh
+++ b/tools/keystone/writepass.sh
@@ -13,10 +13,8 @@ set -o errexit
set -o nounset
set -o pipefail
-# if running as part of Jenkins job, read and create the files from/in WORKSPACE
-WORKSPACE=${WORKSPACE:-/root}
-PASSWORD_FILE_ENC="${WORKSPACE}/servicepass.ini"
-PASSWORD_FILE="${WORKSPACE}/passwords.ini"
+PASSWORD_FILE_ENC="/root/servicepass.ini"
+PASSWORD_FILE="/root/passwords.ini"
function ini_has_option {
local file=$1