From 1a667b0f76e3c281946d22a8a8b951498be23872 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Wed, 29 Mar 2017 11:37:31 -0400
Subject: Pins ODL L3 VPP/HC packages

JIRA: APEX-421

Change-Id: I18a1624af96be772820938e3138666c51b10301c
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 621bfd97aa74877177039ada39c0c8f9578a0220)
---
 build/overcloud-full.sh           |  9 +++++++++
 build/variables.sh                |  9 +++++++++
 lib/overcloud-deploy-functions.sh | 12 ++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index dbf297fd..9de6d9ab 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -87,6 +87,13 @@ EOF
 # Get Real Time Kernel from kvm4nfv
 populate_cache $kvmfornfv_uri_base/$kvmfornfv_kernel_rpm
 
+# ODL/FDIO packages frozen for L3 scenarios
+fdio_l3_pkg_str=''
+for package in ${fdio_l3_pkgs[@]}; do
+  wget "$fdio_l3_uri_base/$package"
+  fdio_l3_pkg_str+=" --upload ${BUILD_DIR}/${package}:/root/fdio_l3/"
+done
+
 # ODL/FDIO packages frozen for L2 scenarios
 fdio_l2_pkg_str=''
 for package in ${fdio_l2_pkgs[@]}; do
@@ -119,8 +126,10 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "mkdir /root/dpdk_rpms" \
     --upload ${BUILD_DIR}/fdio.repo:/etc/yum.repos.d/fdio.repo \
     $dpdk_pkg_str \
+    --run-command "mkdir /root/fdio_l3" \
     --run-command "mkdir /root/fdio_l2" \
     --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio_l2 \
+    $fdio_l3_pkg_str \
     $fdio_l2_pkg_str \
     --run-command "yum install -y /root/fdio_l2/*.rpm" \
     --run-command "yum install -y etcd" \
diff --git a/build/variables.sh b/build/variables.sh
index 5249c2ec..32d6aed9 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -57,6 +57,15 @@ netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noar
 
 gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm
 
+fdio_l3_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l3_rpms
+fdio_l3_pkgs=(
+'vpp-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm'
+'vpp-api-python-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm'
+'vpp-lib-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm'
+'vpp-plugins-17.04-rc0~399_g17a75cb~b2022.x86_64.rpm'
+'honeycomb-1.17.04-2503.noarch.rpm'
+)
+
 fdio_l2_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_l2_rpms
 fdio_l2_pkgs=(
 'vpp-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 37e8229b..e7abdd03 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -264,12 +264,20 @@ EOI
   fi
 
   # Override ODL if FDIO and ODL L2
-  if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['sdn_l3']}" == "False" ]]; then
-    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+  if [[ "${deploy_options_array['vpp']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
+    if [ "${deploy_options_array['sdn_l3']}" == "False" ]; then
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
          LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \
                                                   --run-command "yum -y install /root/fdio_l2/opendaylight*.rpm" \
                                                   -a overcloud-full.qcow2
 EOI
+    else
+      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins honeycomb" \
+                                                  --run-command "yum -y install /root/fdio_l3/*.rpm" \
+                                                  -a overcloud-full.qcow2
+EOI
+    fi
   fi
 
   # check if ceph should be enabled
-- 
cgit 1.2.3-korg