summaryrefslogtreecommitdiffstats
path: root/build/overcloud-opendaylight-sfc.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-09-21 23:11:01 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-21 23:11:01 +0000
commitea38c8623bcd509a30b7e9afaf0a66d40aa618c9 (patch)
tree566f1472b3a2956d9657792572bb05880defd83d /build/overcloud-opendaylight-sfc.sh
parenteb2d183dd36454f4f391d5b44a37aa321b5a7c36 (diff)
parent839cc3c0c4d625a163c238e0c08b5540e4e2e1ab (diff)
Merge "Fixes SFC OVS to be built in Apex"
Diffstat (limited to 'build/overcloud-opendaylight-sfc.sh')
-rwxr-xr-xbuild/overcloud-opendaylight-sfc.sh11
1 files changed, 2 insertions, 9 deletions
diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh
index 612f483d..444d284a 100755
--- a/build/overcloud-opendaylight-sfc.sh
+++ b/build/overcloud-opendaylight-sfc.sh
@@ -19,15 +19,8 @@ pushd images > /dev/null
cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qcow2
# 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}/${onos_ovs_pkg}
- tar -xzf ${onos_ovs_pkg}
-fi
-
-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/ \
- --run-command "yum upgrade -y /root/${ovs_rpm_name}" \
+LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
+ --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \
-a overcloud-full-opendaylight-sfc_build.qcow2
mv overcloud-full-opendaylight-sfc_build.qcow2 overcloud-full-opendaylight-sfc.qcow2