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=0b70cd489119dd2fdde14c0e34e307d8fb6d24ae;hpb=8e1d108f64f06572790ee4db71bc1d9dd32e82da;p=yaml_builds.git

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
old mode 100644
new mode 100755
index 0b70cd4..62a2e77
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -15,10 +15,12 @@
 # limitations under the License.                                             #
 ##############################################################################
 
-set -x
-TIMESTAMP=$(date +"%Y%m%d%H%M")
-echo "Logging to /var/log/yaml_builds/2genesis_$TIMESTAMP.log"
-exec > /var/log/yaml_builds/2genesis_$TIMESTAMP.log
+set -xe
+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"
+exec 1> >(tee -a $LOGFILE)
 exec 2>&1
 
 source $(dirname $0)/setenv.sh
@@ -44,16 +46,29 @@ source $(dirname $0)/env_$SITE.sh
 cd $YAML_BUILDS
 # 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/tools/install_server_os.sh --rc /opt/akraino/yaml_builds/tools/"$GENESIS_NAME"rc --skip-confirm
+/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
+