From: davidplunkett <dp7642@att.com>
Date: Sat, 2 Nov 2019 03:19:34 +0000 (+0000)
Subject: update MAAS url in deploy_site output
X-Git-Tag: 2.0.0-AKRAINO~24
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=1b6c302a60b9215d71a8eb80c4b14f56377cb0f5;p=yaml_builds.git

update MAAS url in deploy_site output

Signed-off-by: davidplunkett <dp7642@att.com>
Change-Id: I11b0f78f780e6e1182c441fb24aa291726c9c9be
---

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 5a08cd2..4284af2 100755
--- a/tools/1prom-gen.sh
+++ b/tools/1prom-gen.sh
@@ -19,6 +19,7 @@
 # re-generate prom config
 
 set -xe
+
 LOGDIR="/var/log/akraino"
 mkdir -p $LOGDIR
 LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
@@ -115,8 +116,10 @@ $AIRSHIP_TREASUREMAP/tools/airship promenade build-all --validators -o /target/$
 (
 echo "# Copying scripts to $AIRSHIP_TREASUREMAP/${SITE}_bundle"
   SHIPYARD_PASSWORD=$(grep "^data:" $AIRSHIP_TREASUREMAP/site/$SITE/secrets/passphrases/ucp_shipyard_keystone_password.yaml | awk '{print $2}')
-  AUTH_DOMAIN=$(grep "ingress_domain:" $AIRSHIP_TREASUREMAP/site/$SITE/networks/common-addresses.yaml | awk '{print $2}')
-  AUTH_URL="http:\/\/iam-sw.${AUTH_DOMAIN}:80\/v3"
+  INGRESS_DOMAIN=$(grep "ingress_domain:" $AIRSHIP_TREASUREMAP/site/$SITE/networks/common-addresses.yaml | awk '{print $2}')
+  AUTH_URL="http://iam-sw.${INGRESS_DOMAIN}:80/v3"
+  MAAS_URL="http://maas-sw.${INGRESS_DOMAIN}:80/MAAS/#/dashboard"
+  AIRFLOW_URL=
   REGION_NAME=$SITE
 
   DEPLOY_SCRIPT=$AIRSHIP_TREASUREMAP/${SITE}_bundle/deploy_site.sh
@@ -126,7 +129,8 @@ echo "# Copying scripts to $AIRSHIP_TREASUREMAP/${SITE}_bundle"
   sed -i -e "s|OS_AUTH_URL=|OS_AUTH_URL=\"${AUTH_URL}\"|g" $DEPLOY_SCRIPT
   sed -i -e "s/OS_PASSWORD=/OS_PASSWORD=$SHIPYARD_PASSWORD/g" $DEPLOY_SCRIPT
   sed -i -e "s/REGION_NAME=/REGION_NAME=$REGION_NAME/g" $DEPLOY_SCRIPT
-  sed -i -e "s/{{yaml.genesis.host}}/$GENESIS_HOST/g" $DEPLOY_SCRIPT
+  sed -i -e "s|MAAS_URL=|MAAS_URL=${MAAS_URL}|g" $DEPLOY_SCRIPT
+  sed -i -e "s|AIRFLOW_URL=|AIRFLOW_URL=${AIRFLOW_URL}|g" $DEPLOY_SCRIPT
 
   cp $YAML_BUILDS/tools/update_iptables.sh $AIRSHIP_TREASUREMAP/${SITE}_bundle
   sed -i -e "s,HOST_INTERFACE=,HOST_INTERFACE=$HOST_INTERFACE,g" $IPTABLES_SCRIPT
diff --git a/tools/deploy_site.sh b/tools/deploy_site.sh
index b604165..a8dd66b 100755
--- a/tools/deploy_site.sh
+++ b/tools/deploy_site.sh
@@ -28,6 +28,8 @@ export OS_AUTH_URL=
 export OS_USERNAME=shipyard
 export OS_PASSWORD=
 REGION_NAME=
+MAAS_URL=
+AIRFLOW_URL=
 
 sleep 900
 
@@ -46,10 +48,9 @@ tools/airship shipyard describe $SHIPYARD_ACTION
 echo "## Airship deployment has been started..."
 echo "##"
 echo "## To monitor progress check:"
-echo "## MaaS GUI    -> http://{{yaml.genesis.host}}:30001/MAAS/#/nodes"
-echo "## Airflow GUI -> http://{{yaml.genesis.host}}:30004/admin/taskinstance/"
+echo "## MaaS GUI    -> $MAAS_URL"
+echo "## Airflow GUI -> $AIRFLOW_URL"
 
 exec 2>&-
 exec 1>&-
 exit 0
-