X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2F1prom-gen.sh;h=0d00bb7f4bd54abce863e82d18caff27f7af800c;hb=HEAD;hp=2852a28dfc3d8050606db4c6612a5b3eb27debc3;hpb=96b1112e21fe903fdc0da5e06f324f9856f1a44d;p=yaml_builds.git

diff --git a/tools/1prom-gen.sh b/tools/1prom-gen.sh
index 2852a28..0d00bb7 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)"
@@ -67,6 +68,7 @@ else
   cd $YAML_BUILDS
 fi
 
+(
 echo "# Collecting config files in $AIRSHIP_TREASUREMAP/site/$SITE"
 cd $AIRSHIP_TREASUREMAP
 rm -rf $AIRSHIP_TREASUREMAP/${SITE}_collected
@@ -114,24 +116,37 @@ $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
+  UPDATE_SCRIPT=$AIRSHIP_TREASUREMAP/${SITE}_bundle/update_software.sh
   IPTABLES_SCRIPT=$AIRSHIP_TREASUREMAP/${SITE}_bundle/update_iptables.sh
 
   cp $YAML_BUILDS/tools/deploy_site.sh $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_software.sh $AIRSHIP_TREASUREMAP/${SITE}_bundle
+  sed -i -e "s|OS_AUTH_URL=|OS_AUTH_URL=\"${AUTH_URL}\"|g" $UPDATE_SCRIPT
+  sed -i -e "s/OS_PASSWORD=/OS_PASSWORD=$SHIPYARD_PASSWORD/g" $UPDATE_SCRIPT
+  sed -i -e "s/REGION_NAME=/REGION_NAME=$REGION_NAME/g" $UPDATE_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
   sed -i -e "s,PXE_INTERFACE=,PXE_INTERFACE=$PXE_INTERFACE,g" $IPTABLES_SCRIPT
 
   cp $YAML_BUILDS/tools/cleanup.sh $AIRSHIP_TREASUREMAP/${SITE}_bundle
+
+  cp $YAML_BUILDS/tools/openrc $AIRSHIP_TREASUREMAP/${SITE}_bundle
+
+  cp $YAML_BUILDS/tools/run_openstack_cli.sh $AIRSHIP_TREASUREMAP/${SITE}_bundle
 )
 
 (
@@ -147,4 +162,4 @@ echo "#######################################"
 echo "# $0 finished"
 echo "#######################################"
 
-pkill -9 $$ && exit 0
+#pkill -9 $$ && exit 0