diff options
author | Tim Rozet <trozet@redhat.com> | 2016-07-11 11:57:06 -0400 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2016-07-13 11:04:05 -0400 |
commit | 7054599033d84f87037badf6ed896483417af2f6 (patch) | |
tree | 432f4622a8458c45ef631685150c3eb85a604260 /build/overcloud-onos.sh | |
parent | e73182cbfa7f7b544fddfcbc0ea79644722d730e (diff) |
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 <trozet@redhat.com>
Diffstat (limited to 'build/overcloud-onos.sh')
-rwxr-xr-x | build/overcloud-onos.sh | 12 |
1 files changed, 6 insertions, 6 deletions
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 |