From 839cc3c0c4d625a163c238e0c08b5540e4e2e1ab Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 21 Sep 2016 12:48:02 -0400 Subject: 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 --- build/overcloud-onos.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'build/overcloud-onos.sh') diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index 7b5e3df7..b695983a 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -19,12 +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}/${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/ \ - --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-onos_build.qcow2 -- cgit 1.2.3-korg