Fixes NSH OVS 2.5.90

A bump in overcloud kernel caused NSH OVS to break.  This patch upgrades
the OVS RPMs.

JIRA: APEX-214

Change-Id: I03179b47c4456decfa869e2e5065c1a5a1de579e
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 4b8b135..7b5e3df 100755 (executable)
--- a/build/overcloud-onos.sh
+++ b/build/overcloud-onos.sh
@@ -19,8 +19,8 @@ cp -f overcloud-full.qcow2 overcloud-full-onos_build.qcow2
 #######################################
 
 # upgrade ovs into ovs 2.5.90 with NSH function
-curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz
-tar -xzf package_ovs_rpm2.tar.gz
+curl -L -O ${onos_ovs_uri}/${onos_ovs_pkg}
+tar -xzf ${onos_ovs_pkg}
 LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \
                                          --run-command "yum install -y /root/${ovs_kmod_rpm_name}" \
                                          --upload ${ovs_rpm_name}:/root/ \

diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh
index 7f8508a..612f483 100755 (executable)
--- a/build/overcloud-opendaylight-sfc.sh
+++ b/build/overcloud-opendaylight-sfc.sh
@@ -20,8 +20,8 @@ cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qc
 
 # upgrade ovs into ovs 2.5.90 with NSH function
 if ! [[ -f "$ovs_rpm_name"  &&  -f "$ovs_kmod_rpm_name" ]]; then
-  curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz
-  tar -xzf package_ovs_rpm2.tar.gz
+  curl -L -O ${onos_ovs_uri}/${onos_ovs_pkg}
+  tar -xzf ${onos_ovs_pkg}
 fi
 
 LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \

diff --git a/build/variables.sh b/build/variables.sh
index 134cc29..fda735c 100644 (file)
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -12,7 +12,8 @@ rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/mitaka/delorean/stable
 onos_release_uri=https://downloads.onosproject.org/nightly/
 onos_release_file=onos-1.6.0-rc2.tar.gz
 onos_jdk_uri=https://www.dropbox.com/s/qyujpib8zyhzeev
-onos_ovs_uri=https://www.dropbox.com/s/2dyd8zyt2l6p586
+onos_ovs_uri=https://www.dropbox.com/s/ojknqcozb2w6z3l
+onos_ovs_pkg=package_ovs_rpm3.tar.gz
 doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congress/datasources/doctor_driver.py
 
 dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv