From af7aa485a0eb746a7d7c6a5b5dcf00ed9f4eba57 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Wed, 26 Apr 2017 08:01:15 -0400
Subject: Update VPP/ODL versions for FDIO scenarios

Pin the same set of FDIO and OpenDaylight versions for all fdio
scenarios.

Note that fdio_netvirt-fdio still uses a customized ODL version.

os-net-config-pr: 7
JIRA: APEX-451

Change-Id: Ic5ac5aeead9967fe383447e23653276cde2dfe60
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 lib/overcloud-deploy-functions.sh | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'lib')

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 9b27bfa1..8ce05442 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -253,10 +253,6 @@ EOI
         echo -e "${blue}INFO: nosdn fdio deployment...installing correct vpp packages...${reset}"
         ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
           sed -i "/NeutronVPPAgentPhysnets:/c\  NeutronVPPAgentPhysnets: 'datacentre:${tenant_nic_mapping_controller_members}'" ${ENV_FILE}
-          LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum remove -y vpp vpp-api-python vpp-lib vpp-plugins" \
-                                                   --run-command "yum install -y /root/fdio_nosdn/*.rpm" \
-                                                   --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
-                                                   -a overcloud-full.qcow2
 EOI
       else
         echo -e "${red}Compute and Controller must use the same tenant nic name, please modify network setting file.${reset}"
@@ -286,29 +282,13 @@ EOI
 EOI
   fi
 
-  # Override ODL if FDIO and ODL L2
-  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" \
-                                                  --run-command "rm -f /etc/sysctl.d/80-vpp.conf" \
-                                                  -a overcloud-full.qcow2
-EOI
-    fi
-    if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
-      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
-        LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
-                                                 --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \
-                                                 -a overcloud-full.qcow2
+  # Override ODL if we enable netvirt for fdio
+  if [[ "${deploy_options_array['odl_vpp_netvirt']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
+    ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+      LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \
+                                               --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \
+                                               -a overcloud-full.qcow2
 EOI
-    fi
   fi
 
   # check if ceph should be enabled
-- 
cgit 1.2.3-korg