diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-07-28 17:18:19 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-07-28 17:18:19 -0400 |
| commit | 31b10ea2994fc4d6614c0a31b0f54dbd58dc7abc (patch) | |
| tree | 35102a0e9e29ce52df66de7f65c0533819193e2f | |
| parent | 72c2c090143d29be9c152bf189324277921f2b90 (diff) | |
Changes SFC to use different OVS build
JIRA: APEX-214
Change-Id: I8ee0af560313f0467c155cda63106f53147e39ef
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | build/overcloud-onos.sh | 4 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight-sfc.sh | 4 | ||||
| -rw-r--r-- | build/variables.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index e13923d9..4b8b1350 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_rpm_new.tar.gz -tar -xzf package_ovs_rpm_new.tar.gz +curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz +tar -xzf package_ovs_rpm2.tar.gz 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 5032ba06..7f8508a8 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_rpm_new.tar.gz - tar -xzf package_ovs_rpm_new.tar.gz + curl -L -O ${onos_ovs_uri}/package_ovs_rpm2.tar.gz + tar -xzf package_ovs_rpm2.tar.gz fi LIBGUESTFS_BACKEND=direct virt-customize --upload ${ovs_kmod_rpm_name}:/root/ \ diff --git a/build/variables.sh b/build/variables.sh index 6632b526..27118c93 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -12,7 +12,7 @@ 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/7rfr9l2qz3a36cc +onos_ovs_uri=https://www.dropbox.com/s/2dyd8zyt2l6p586 openstack_congress=https://radez.fedorapeople.org/openstack-congress-2016.1-1.fc24.noarch.rpm doctor_driver=https://raw.githubusercontent.com/muroi/congress/doctor-poc/congress/datasources/doctor_driver.py @@ -25,5 +25,5 @@ dpdk_rpms=( 'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm' ) -ovs_rpm_name=openvswitch-2.5.90-0.11974.gitc4623bb8.1.el7.centos.x86_64.rpm +ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm |