nosdn fdio scenario fixes

- pins nosdn fdio packages that work
- disable l3 agent ha mode

opnfv-tht-pr: 130

Change-Id: I9470565768611f83cbd6e34f567a0aec58fa65ef
Signed-off-by: Tim Rozet <trozet@redhat.com>
Signed-off-by: Feng Pan <fpan@redhat.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 963579f3..c6a53e3d 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -94,6 +94,13 @@ for package in ${fdio_l2_pkgs[@]}; do
   fdio_l2_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l2/"
 done
 
+# FDIO packages frozen for nosdn scenarios
+fdio_nosdn_pkg_str=''
+for package in ${fdio_nosdn_pkgs[@]}; do
+  wget "$fdio_nosdn_uri_base/$package"
+  fdio_nosdn_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_nosdn/"
+done
+
 # Increase disk size by 900MB to accommodate more packages
 qemu-img resize overcloud-full_build.qcow2 +900MB
 
@@ -121,9 +128,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     $dpdk_pkg_str \
     --run-command "mkdir /root/fdio_l3" \
     --run-command "mkdir /root/fdio_l2" \
-    --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \
+    --run-command "mkdir /root/fdio_nosdn" \
+    --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_nosdn \
     $fdio_l3_pkg_str \
     $fdio_l2_pkg_str \
+    $fdio_nosdn_pkg_str \
     --run-command "yum install -y /root/fdio_l2/*.rpm" \
     --run-command "yum install -y etcd" \
     --install python-etcd \