X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=tools%2F2genesis.sh;h=62a2e777a9d9e003edc6fea4d8c6e770db77c0cf;hb=refs%2Fchanges%2F86%2F1886%2F2;hp=4b054373434fd0acb40dd7ee21d8a8ed86c1657e;hpb=23f30c07e1b783f37c8df3c08e59bf045c3f5129;p=yaml_builds.git

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 4b05437..62a2e77 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"
@@ -48,18 +48,26 @@ cd $YAML_BUILDS
 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
 
+# 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/
+  mkdir -p /root/akraino/configs/promenade-bundle
+  mv /tmp/promenade-bundle-$SITE.tar /root/akraino/
   cd /root/akraino/
   tar -xmf promenade-bundle-$SITE.tar
+  # MOVE TO LOCATION EXPECTED BY WORKFLOW
+  mv genesis.sh /root/akraino/configs/promenade-bundle/
 EOF
-# Update BIOS Setting
+
+# Update BIOS settings on master and worker nodes
 python $YAML_BUILDS/scripts/update_bios_settings.py $SITE.yaml
 
+echo "#######################################"
+echo "# $0 finished"
+echo "#######################################"
+
 exec 2>&-
 exec 1>&-
 exit 0