summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-10-18 21:25:37 -0400
committerMichael Chapman <michapma@redhat.com>2016-10-18 21:46:18 -0400
commit33bb282dbbea2a2f17c5b3153e60dfff30c4bb15 (patch)
tree6b91fe149b1d3f4a501f4dda3a5784e298af3287
parent310e57e504024c40e4043e39c3e7b663add16f3a (diff)
Use SFC OVS version for ONOS when SFC is enabled
JIRA: APEX-334 This regressed when we moved over to installing the replacement ovs at runtime instead of build time Change-Id: I9624dd32f84e47e3e92dbb091655280b44734e25 Signed-off-by: Michael Chapman <michapma@redhat.com>
-rwxr-xr-xlib/overcloud-deploy-functions.sh16
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