diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-21 12:48:02 -0400 |
|---|---|---|
| committer |   Feng Pan <fpan@redhat.com> | 2016-09-21 17:32:13 -0400 |
| commit | 839cc3c0c4d625a163c238e0c08b5540e4e2e1ab (patch) | |
| tree | c27210dd5abca2afb89870731b2e2ef1500364a7 /build/overcloud-opendaylight-sfc.sh | |
| parent | 4523fd8c90acf923a526cae390922c1dbcd6220e (diff) | |
Fixes SFC OVS to be built in Apex
Our kernel version is always updated in our build, causing static kmod
builds for OVS to fail. This adds OVS NSH to Apex build process.
JIRA: APEX-214
Change-Id: Ib071565d71c3471c2a03345b999adcad5af1962f
Signed-off-by: Tim Rozet <trozet@redhat.com>
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 |