From 7054599033d84f87037badf6ed896483417af2f6 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 11 Jul 2016 11:57:06 -0400 Subject: Fixes build and deploy options for SFC/ONOS SFC for colorado will be based on OVS 2.5.90 which does not need 3.13 kernel. This patch removes 3.13 kernel updates, adds OVS 2.5.90 and sets default odl_version to use boron (required for SFC with OVS 2.5.90). Also updates OVS build to a working one for ONOS. JIRA: APEX-156 JIRA: APEX-199 Change-Id: I095290d925138122f24e891f8412497f9a2c3141 Signed-off-by: Tim Rozet --- build/overcloud-onos.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'build/overcloud-onos.sh') diff --git a/build/overcloud-onos.sh b/build/overcloud-onos.sh index d59be0a3..e13923d9 100755 --- a/build/overcloud-onos.sh +++ b/build/overcloud-onos.sh @@ -19,12 +19,12 @@ 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.tar.gz -tar -xzf package_ovs_rpm.tar.gz -LIBGUESTFS_BACKEND=direct virt-customize --upload openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm:/root/ \ - --run-command "yum install -y /root/openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm" \ - --upload openvswitch-2.5.90-1.el7.centos.x86_64.rpm:/root/ \ - --run-command "yum upgrade -y /root/openvswitch-2.5.90-1.el7.centos.x86_64.rpm" \ +curl -L -O ${onos_ovs_uri}/package_ovs_rpm_new.tar.gz +tar -xzf package_ovs_rpm_new.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/ \ + --run-command "yum upgrade -y /root/${ovs_rpm_name}" \ -a overcloud-full-onos_build.qcow2 -- cgit 1.2.3-korg