diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-19 14:58:41 +0000 |
|---|---|---|
| committer |   Michael Chapman <michapma@redhat.com> | 2016-10-19 02:53:35 -0400 |
| commit | d39cae2b09362c7df6351e9018a26afc7ce130e9 (patch) | |
| tree | e4c2cdc118574fc3fb6cb41358db7fd5f9068b93 /lib | |
| parent | 1aa2897aea3529dfacfd058d436f6878cd940e73 (diff) | |
Revert "Use SFC OVS version for ONOS when SFC is enabled"
This reverts commit 33bb282dbbea2a2f17c5b3153e60dfff30c4bb15.
Change-Id: I1136c1bd2570a1de50c861c7285434cd244d3b2a
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 2146cf86..18d1ec46 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -108,6 +108,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['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 @@ -115,15 +122,6 @@ 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 |