diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-22 00:16:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-22 00:16:54 +0000 |
| commit | 37ea481a9b917d7776146acdb19299bbcdd4149b (patch) | |
| tree | c60c464a8dbd7e89c7f56d135da6014e42a7bc98 /build/overcloud-opendaylight-sfc.sh | |
| parent | fb33963fecf6cab1ea9cb70b9f3ba74ad5e60f4a (diff) | |
| parent | f0734f2fe70245562ef82f2cb0a5a98ae5bb3143 (diff) | |
Merge "Fixes SFC OVS to be built in Apex" into stable/colorado
Diffstat (limited to 'build/overcloud-opendaylight-sfc.sh')
| -rwxr-xr-x | build/overcloud-opendaylight-sfc.sh | 11 |
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 |