aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-11 16:53:04 +0000
committerGerrit Code Review <review@openstack.org>2017-01-11 16:53:04 +0000
commitb09c0964865c58f9e86bf13173f5878b6c922375 (patch)
treeb623abe988012fcd96fda8807421a058d787c7c1
parentd6d65a18653f8fd1ce073b2a3eec2cba1cb4ae8a (diff)
parent00b2529d6322a7ff5d1c5d8707d400bf019b23b4 (diff)
Merge "Allow freeipa environment file to be in /tmp"
-rw-r--r--ci/scripts/freeipa_setup.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/scripts/freeipa_setup.sh b/ci/scripts/freeipa_setup.sh
index f6a0f921..9f5f2dc6 100644
--- a/ci/scripts/freeipa_setup.sh
+++ b/ci/scripts/freeipa_setup.sh
@@ -13,6 +13,8 @@ set -eux
if [ -f "~/freeipa-setup.env" ]; then
source ~/freeipa-setup.env
+elif [ -f "/tmp/freeipa-setup.env" ]; then
+ source /tmp/freeipa-setup.env
fi
# Set DNS servers