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>

5 files changed, 23 insertions, 107 deletions

diff --git a/build/honeycomb-jar-replace.sh b/build/honeycomb-jar-replace.sh
deleted file mode 100755
index f89ddda7..00000000
--- a/build/honeycomb-jar-replace.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-JARS=$(find /usr/share/java/ -type f -iname 'jvpp-*.jar')
-if [ -z "$JARS" ]; then
-  echo "ERROR: JARS to replace from vpp-api-java are empty!"
-  exit 1
-fi
-
-for JAR in $JARS; do
-  JAR_PREFIX=$(basename $JAR | sed -n 's/-[0-9]\+\.[0-9]\+\.jar$//p')
-  JAR_VERSION=$(basename $JAR | grep -Eo '[0-9]+.[0-9]+')
-  HC_JAR_DIR=/opt/honeycomb/lib/io/fd/vpp/${JAR_PREFIX}/${JAR_VERSION}-SNAPSHOT
-  if [ ! -d "$HC_JAR_DIR" ]; then
-    echo "ERROR: Honeycomb JAR destination directory does not exist!"
-    exit 1
-  else
-    cp -f ${JAR} ${HC_JAR_DIR}/${JAR_PREFIX}-${JAR_VERSION}-SNAPSHOT.jar
-    echo "INFO: VPP API JAR: ${JAR} copied to ${HC_JAR_DIR}"
-  fi
-done
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index c6a53e3d..9ecb1c32 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -68,37 +68,14 @@ pushd puppet-tacker > /dev/null
 git archive --format=tar.gz --prefix=tacker/ origin/stable/ocata > ${BUILD_DIR}/puppet-tacker.tar.gz
 popd > /dev/null
 
-# Master FD.IO Repo
-cat > ${BUILD_DIR}/fdio.repo << EOF
-[fdio-master]
-name=fd.io master branch latest merge
-baseurl=https://nexus.fd.io/content/repositories/fd.io.master.centos7/
-enabled=1
-gpgcheck=0
-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
-  wget "$fdio_l2_uri_base/$package"
-  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/"
+# packages frozen for fdio scenarios
+fdio_pkg_str=''
+for package in ${fdio_pkgs[@]}; do
+  wget "$package"
+  fdio_pkg_str+=" --upload ${BUILD_DIR}/${package##*/}:/root/fdio/"
 done
 
 # Increase disk size by 900MB to accommodate more packages
@@ -124,16 +101,11 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \
     --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \
     --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" \
-    --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 "mkdir /root/fdio" \
+    --upload ${BUILD_DIR}/noarch/$netvpp_pkg:/root/fdio \
+    $fdio_pkg_str \
+    --run-command "yum install -y /root/fdio/*.rpm" \
     --run-command "yum install -y etcd" \
     --install python-etcd \
     --run-command "puppet module install cristifalcas/etcd" \
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index b256f5ca..131427c3 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -90,10 +90,9 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \
     --run-command "yum install --downloadonly --downloaddir=/root/master/ opendaylight" \
     --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \
-    --run-command "wget ${fdio_l2_uri_base}/honeycomb-1.17.04-2439.noarch.rpm -O /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \
-    --run-command "wget ${fdio_l2_uri_base}/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm -O /root/fdio_l2/opendaylight-6.0.0-0.1.20170228snap4111.el7.noarch.rpm" \
+    --run-command "wget https://nexus.fd.io/content/repositories/fd.io.stable.1704.centos7/io/fd/hc2vpp/honeycomb/1.17.04-2048.noarch/honeycomb-1.17.04-2048.noarch.rpm -O /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
     --install opendaylight,python-networking-odl \
-    --run-command "yum install -y /root/fdio_l2/honeycomb-1.17.04-2439.noarch.rpm" \
+    --run-command "yum install -y /root/fdio/honeycomb-1.17.04-2048.noarch.rpm" \
     --upload ${BUILD_DIR}/puppet-opendaylight.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight.tar.gz" \
     --upload ${BUILD_DIR}/networking-bgpvpn.tar.gz:/root/ \
diff --git a/build/variables.sh b/build/variables.sh
index 6064dc8e..23f25eb2 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -57,27 +57,11 @@ 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_pkgs=(
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/17.04-release.x86_64/vpp-17.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/17.04-release.x86_64/vpp-api-python-17.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/17.04-release.x86_64/vpp-lib-17.04-release.x86_64.rpm'
+'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/17.04-release.x86_64/vpp-plugins-17.04-release.x86_64.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'
-'vpp-api-python-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
-'vpp-lib-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
-'vpp-plugins-17.04-rc0~300_gdef19da~b1923.x86_64.rpm'
-)
-
-fdio_nosdn_uri_base=http://artifacts.opnfv.org/apex/danube/fdio_nosdn_rpms
-fdio_nosdn_pkgs=(
-'vpp-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
-'vpp-api-python-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
-'vpp-lib-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
-'vpp-plugins-17.04-rc0~476_geaabe07~b2100.x86_64.rpm'
-)
+honeycomb_pkg='http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/honeycomb-1.17.04-2048.noarch.rpm'
\ No newline at end of file
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