summaryrefslogtreecommitdiffstats
path: root/auth/docker/agent.sh
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-23 10:49:55 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-23 10:50:05 -0500
commit5b37375d4f4e3764e10b813829881ae7217403f0 (patch)
tree357e2d11a2c62caf200f1519ad87396608459488 /auth/docker/agent.sh
parentcf52d77279f8d5a70429d45abad0ef3d1135070c (diff)
Fix Test Hello
Issue-ID: AAF-381 Change-Id: I038559b22af061ffb3bd23048122d7cf87fbed22 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/docker/agent.sh')
-rw-r--r--auth/docker/agent.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index eb0bf3aa..4aba092c 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -6,12 +6,20 @@ CADI_VERSION=2.1.2-SNAPSHOT
if [ ! -e aaf.props ]; then
> ./aaf.props
fi
-for V in VERSION AAF_FQDN DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
+
+. ./aaf.props
+
+for V in VERSION AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do
if [ "$(grep $V ./aaf.props)" = "" ]; then
unset DEF
case $V in
AAF_FQDN) PROMPT="AAF's FQDN";;
DEPLOY_FQI) PROMPT="Deployer's FQI";;
+ AAF_FQDN_IP)
+ # Need AAF_FQDN's IP, because not might not be available in mini-container
+ PROMPT="AAF FQDN IP"
+ DEF=$(host $AAF_FQDN | grep "has address" | tail -1 | cut -f 4 -d ' ')
+ ;;
APP_FQI) PROMPT="App's FQI";;
APP_FQDN) PROMPT="App's Root FQDN";;
VOLUME) PROMPT="APP's AAF Configuration Volume";;
@@ -39,15 +47,6 @@ for V in VERSION AAF_FQDN DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LON
done
. ./aaf.props
-# Need AAF_FQDN's IP, because not might not be available in mini-container
-if [ "$AAF_FQDN_IP" = "" ]; then
- AAF_FQDN_IP=$(host $AAF_FQDN | grep "has address" | tail -1 | cut -f 4 -d ' ')
- if [ "$AAF_FQDN_IP" = "" ]; then
- read -p "IP of $AAF_FQDN: " AAF_FQDN_IP
- echo "AAF_FQDN_IP=$AAF_FQDN_IP" >> ./aaf.props
- fi
-fi
-
# Make sure Container Volume exists
if [ "$(docker volume ls | grep ${VOLUME})" = "" ]; then
echo -n "Creating Volume: "