diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-10-19 14:14:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-19 14:14:58 +0000 |
| commit | 7713b74ad0db1944282bb1213afe5a4db83a02ec (patch) | |
| tree | b194b9eafe631316063fd8cdf108b04fbe66e10f | |
| parent | c44e8ee96f21f415f26ec3dbeaf9172081f830c8 (diff) | |
| parent | 33bb282dbbea2a2f17c5b3153e60dfff30c4bb15 (diff) | |
Merge "Use SFC OVS version for ONOS when SFC is enabled"
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 18d1ec46..2146cf86 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -108,13 +108,6 @@ 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['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 @@ -122,6 +115,15 @@ EOI exit 1 fi + if [ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'onos' ]; then + # upgrade ovs into ovs 2.5.90 with NSH function + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + 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 +EOI + fi + if [ "$debug" == 'TRUE' ]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex" fi |