diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-10-12 10:52:27 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-10-13 13:14:13 +0000 |
| commit | fc141a3b62cc1c4de6c322eb47d2153440623791 (patch) | |
| tree | 5ce5fb5c3830687538354ee693449b6448dfff31 /lib | |
| parent | f8da17969ca068b13dd5cdf628f530e111269d8d (diff) | |
Conditionally install OVS NSH in ONOS deployment
OVS with NSH should be installed only if we're enabling SFC in an
ONOS deployment
JIRA: APEX-331
Change-Id: I54826bb2d62b20c42f00c856d8458444f2f795e5
Signed-off-by: Dan Radez <dradez@redhat.com>
(cherry picked from commit 8c30286eba760e1c2dc3c6a9812d7be5a02de47d)
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 60d5e140..0f588b2f 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -67,7 +67,6 @@ function overcloud_deploy { # Make sure the correct overcloud image is available if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment." - echo "Both ONOS and OpenDaylight are currently deployed from this image." echo "Please install the opnfv-apex package to provide this overcloud image for deployment.${reset}" exit 1 fi @@ -117,6 +116,13 @@ EOF --run-command "sed -i 's/\\(^\\s\\+\\)\\(start_daemon "$OVS_VSWITCHD_PRIORITY"\\)/\\1umask 0002 \\&\\& \\2/' /usr/share/openvswitch/scripts/ovs-ctl" \ -a overcloud-full.qcow2 fi + + if [ "${deploy_options_array['sdn_controller']}" == 'onos' && "${deploy_options_array['sfc']}" == 'True' ]; then + # upgrade ovs into ovs 2.5.90 with NSH function + 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.qcow2 + fi EOI elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then |