summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-11 21:22:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-11 21:22:47 +0000
commitf03e10771fb5031a19ae998665d02470af61c11e (patch)
tree3547d6ba113ba6f9cd4869d20e55adad379a06c1
parent8f6db379e0051ed544739fa08b124b18d5979dd9 (diff)
parent05a60233aa46840753dec256ec14668584eb951f (diff)
Merge "Fixes NSH OVS 2.5.90"
-rwxr-xr-xbuild/overcloud-onos.sh4
-rwxr-xr-xbuild/overcloud-opendaylight-sfc.sh4
-rw-r--r--build/variables.sh3
3 files changed, 6 insertions, 5 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh
index 4b8b1350..7b5e3df7 100755
--- 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 7f8508a8..612f483d 100755
--- 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 134cc295..fda735cd 100644
--- 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