fix path errors in tools

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

diff --git a/tools/2genesis.sh b/tools/2genesis.sh
index 70c3ba2..e41eb40 100755 (executable)
--- a/tools/2genesis.sh
+++ b/tools/2genesis.sh
@@ -59,6 +59,9 @@ python $YAML_BUILDS/scripts/jcopy.py $SITE.yaml $YAML_BUILDS/tools/j2/serverrc.j
 echo "# Stage Airship files on Genesis"
 scp $YAML_BUILDS/tars/promenade-bundle-$SITE.tar $GENESIS_HOST:/tmp/
 ssh $GENESIS_HOST << EOF
+  echo "#########################################"
+  echo "# Setup deployment files on genesis host"
+  echo "#########################################"
   # TODO avoid following hard coding$
   route add -net 192.168.41.0/24 gw 192.168.2.1 bond0.41
   mkdir -p /root/akraino
@@ -68,7 +71,8 @@ ssh $GENESIS_HOST << EOF
   mv configs/promenade-bundle/deploy_site.sh .
   mv configs/promenade-bundle/update_software.sh .
   mv configs/promenade-bundle/openrc .
-  cp configs/run_openstack_cli.sh /usr/local/bin/openstack
+  cp configs/promenade-bundle/run_openstack_cli.sh /usr/local/bin/openstack
+  find . -type f -not -path "./tools/*" -not -path "./global/*"
 EOF
 
 echo "# Waiting for BIOS updates to finish on master and worker nodes"

diff --git a/tools/3deploy_site.sh b/tools/3deploy_site.sh
index 2e998d5..7307c22 100755 (executable)
--- a/tools/3deploy_site.sh
+++ b/tools/3deploy_site.sh
@@ -42,7 +42,7 @@ ssh $GENESIS_HOST << EOF
   echo "#######################################################"
   echo "# Running genesis.sh script "
   echo "#######################################################"
-  bash genesis.sh
+  bash ./configs/promenade-bundle/genesis.sh
   # Shipyard takes time to really come up and start responding.
   date
   sleep 900
@@ -55,7 +55,7 @@ ssh $GENESIS_HOST << EOF
   echo "#######################################################"
   echo "# Running deploy_site.sh script "
   echo "#######################################################"
-  #bash deploy_site.sh
+  bash deploy_site.sh
 EOF
 
 exec 2>&-