X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex-snapshot-deploy.sh;h=a93421c8e1e202dfc76c15eea20f6aa3c6a5aea7;hb=a45c528ebfd14095b303270231eb86033258ea65;hp=3bb65a0b3270e1de692abb2737db0f38fe9d6e34;hpb=c5670f63c07f82d572dee6e2fcc35af268e9565a;p=releng.git

diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh
index 3bb65a0b3..a93421c8e 100644
--- a/jjb/apex/apex-snapshot-deploy.sh
+++ b/jjb/apex/apex-snapshot-deploy.sh
@@ -21,9 +21,8 @@ echo "--------------------------"
 echo
 
 echo "Cleaning server"
-git clone https://gerrit.opnfv.org/gerrit/apex.git
-pushd apex/ci > /dev/null
-sudo CONFIG=../build/ LIB=../lib ./clean.sh
+pushd ci > /dev/null
+sudo opnfv-clean
 popd > /dev/null
 
 echo "Downloading latest snapshot properties file"
@@ -42,23 +41,26 @@ fi
 local_snap_checksum=""
 
 # check snap cache directory exists
+# if snapshot cache exists, find the checksum
 if [ -d "$SNAP_CACHE" ]; then
-  latest_snap=$(ls -Art | grep tar.gz | tail -n 1)
+  latest_snap=$(ls ${SNAP_CACHE} | grep tar.gz | tail -n 1)
   if [ -n "$latest_snap" ]; then
-    local_snap_checksum=$(sha512sum ${latest_snap} | cut -d' ' -f1)
+    local_snap_checksum=$(sha512sum ${SNAP_CACHE}/${latest_snap} | cut -d' ' -f1)
   fi
 else
   mkdir -p ${SNAP_CACHE}
 fi
 
 # compare check sum and download latest snap if not up to date
-if [ "$local_snap_checksum" -ne "$latest_snap_checksum" ]; then
+if [ "$local_snap_checksum" != "$latest_snap_checksum" ]; then
   snap_url=$(cat opnfv.properties | grep OPNFV_SNAP_URL | awk -F "=" '{print $2}')
   if [ -z "$snap_url" ]; then
     echo "ERROR: Snap URL from snapshot.properties is null!"
     exit 1
   fi
   echo "INFO: SHA mismatch, will download latest snapshot"
+  # wipe cache
+  rm -rf ${SNAP_CACHE}/*
   wget --directory-prefix=${SNAP_CACHE}/ ${snap_url}
   snap_tar=$(basename ${snap_url})
 else
@@ -67,9 +69,8 @@ fi
 
 echo "INFO: Snapshot to be used is ${snap_tar}"
 
-# create tmp directory and unpack snap
-mkdir -p ./tmp
-pushd ./tmp > /dev/null
+# move to snap cache dir and unpack
+pushd ${SNAP_CACHE} > /dev/null
 tar xvf ${snap_tar}
 
 # create each network
@@ -80,6 +81,12 @@ if [ -z "$virsh_networks" ]; then
   exit 1
 fi
 
+echo "Checking overcloudrc"
+if ! stat overcloudrc; then
+  echo "ERROR: overcloudrc does not exist in snap unpack"
+  exit 1
+fi
+
 for network_def in ${virsh_networks}; do
   sudo virsh net-create ${network_def}
   network=$(echo ${network_def} | awk -F '.' '{print $1}')
@@ -87,22 +94,32 @@ for network_def in ${virsh_networks}; do
     sudo virsh net-start ${network}
   fi
   echo "Checking if OVS bridge is missing for network: ${network}"
-  if ! ovs-vsctl show | grep "br-${network}"; then
-    ovs-vsctl add-br br-${network}
+  if ! sudo ovs-vsctl show | grep "br-${network}"; then
+    sudo ovs-vsctl add-br br-${network}
     echo "OVS Bridge created: br-${network}"
     if [ "br-${network}" == 'br-admin' ]; then
       echo "Configuring IP 192.0.2.99 on br-admin"
       sudo ip addr add  192.0.2.99/24 dev br-admin
       sudo ip link set up dev br-admin
     elif [ "br-${network}" == 'br-external' ]; then
-      echo "Configuring IP 192.168.37.99 on br-external"
-      sudo ip addr add  192.168.37.99/24 dev br-external
+      echo "Configuring IP 192.168.37.1 on br-external"
+      sudo ip addr add  192.168.37.1/24 dev br-external
       sudo ip link set up dev br-external
+      # Routes for admin network
+      # The overcloud controller is multi-homed and will fail to respond
+      # to traffic from the functest container due to reverse-path-filtering
+      # This route allows reverse traffic, by forcing admin network destined
+      # traffic through the external network for controller IPs only.
+      # Compute nodes have no ip on external interfaces.
+      controller_ips=$(cat overcloudrc | grep -Eo "192.0.2.[0-9]+")
+      for ip in $controller_ips; do
+        sudo ip route add ${ip}/32 dev br-external
+      done
     fi
   fi
 done
 
-echo "Virsh networks up: $(virsh net-list)"
+echo "Virsh networks up: $(sudo virsh net-list)"
 echo "Bringing up Overcloud VMs..."
 virsh_vm_defs=$(ls baremetal*.xml)
 
@@ -112,6 +129,7 @@ if [ -z "$virsh_vm_defs" ]; then
 fi
 
 for node_def in ${virsh_vm_defs}; do
+  sed  -ri "s/machine='[^\s]+'/machine='pc'/" ${node_def}
   sudo virsh define ${node_def}
   node=$(echo ${node_def} | awk -F '.' '{print $1}')
   sudo cp -f ${node}.qcow2 /var/lib/libvirt/images/
@@ -119,25 +137,19 @@ for node_def in ${virsh_vm_defs}; do
   echo "Node: ${node} started"
 done
 
-echo "Checking overcloudrc"
-if ! stat overcloudrc; then
-  echo "ERROR: overcloudrc does not exist in snap unpack"
-  exit 1
-fi
-
 # copy overcloudrc for functest
 mkdir -p $HOME/cloner-info
 cp -f overcloudrc $HOME/cloner-info/
 
-admin_controller_ip=$(cat overcloudrc | grep -Eo "192.0.2.[0-9]+")
+admin_controller_ip=$(cat overcloudrc | grep -Eo -m 1 "192.0.2.[0-9]+")
 netvirt_url="http://${admin_controller_ip}:8081/restconf/operational/network-topology:network-topology/topology/netvirt:1"
 
 source overcloudrc
 counter=1
 while [ "$counter" -le 10 ]; do
-  if curl --fail ${admin_controller_ip}:80; then
+  if curl --fail --silent ${admin_controller_ip}:80 > /dev/null; then
     echo "Overcloud Horizon is up...Checking if OpenDaylight NetVirt is up..."
-    if curl --fail ${netvirt_url} > /dev/null; then
+    if curl --fail --silent -u admin:admin ${netvirt_url} > /dev/null; then
       echo "OpenDaylight is up.  Overcloud deployment complete"
       exit 0
     else