Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
| inline |
side by side
Merge "Allow freeipa environment file to be in /tmp"
[apex-tripleo-heat-templates.git]
/
ci
/
scripts
/
freeipa_setup.sh
diff --git
a/ci/scripts/freeipa_setup.sh
b/ci/scripts/freeipa_setup.sh
index
f6a0f92
..
9f5f2dc
100644
(file)
--- 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