X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2F2genesis.sh;h=dca7c9146c058f4f61807c0d2ec0333f43e79449;hb=4c341d3fc54fec7b62269da3390fd0f5d8f779ce;hp=4b054373434fd0acb40dd7ee21d8a8ed86c1657e;hpb=23f30c07e1b783f37c8df3c08e59bf045c3f5129;p=yaml_builds.git

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 4b05437..dca7c91 100755
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -16,7 +16,7 @@
 ##############################################################################
 
 set -xe
-LOGDIR="/var/log/yaml_builds"
+LOGDIR="/var/log/akraino"
 mkdir -p $LOGDIR
 LOGFILE="$LOGDIR/${1}_$(date +"%Y%m%d%H%M%z")_$(basename $0|cut -d. -f1)"
 echo "logging to $LOGFILE"
@@ -44,23 +44,35 @@ fi
 source $(dirname $0)/env_$SITE.sh
 
 cd $YAML_BUILDS
-# Install OS on Genesis
+
+FILENAME=$(mktemp)
+echo "# Updating BIOS settings on master and worker nodes in background [$FILENAME]"
+python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml >$FILENAME &
+
+echo "# Install OS on Genesis"
 python $YAML_BUILDS/scripts/jcopy.py $SITE.yaml $YAML_BUILDS/tools/j2/serverrc.j2 $YAML_BUILDS/tools/"$GENESIS_NAME"rc
 /opt/akraino/redfish/install_server_os.sh --rc /opt/akraino/yaml_builds/tools/"$GENESIS_NAME"rc --skip-confirm
 
+echo "# Stage Airship files on Genesis"
 scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/
 ssh $GENESIS_HOST << EOF
   # TODO avoid following hard coding$
   route add -net 192.168.41.0/24 gw 192.168.2.1 bond0.41
   mkdir -p /root/akraino
-  cp /tmp/promenade-bundle-$SITE.tar /root/akraino/
   cd /root/akraino/
+  cp /tmp/promenade-bundle-$SITE.tar .
   tar -xmf promenade-bundle-$SITE.tar
+  mv configs/promenade-bundle/deploy_site.sh .
 EOF
-# Update BIOS Setting
-python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
 
-exec 2>&-
-exec 1>&-
-exit 0
+echo "# Waiting for BIOS updates to finish on master and worker nodes"
+wait
+# Show output from BIOS updates on master and worker nodes
+cat $FILENAME
+rm $FILENAME
+
+echo "#######################################"
+echo "# $0 finished"
+echo "#######################################"
+#pkill -9 $$ && exit 0