summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2016-10-19 02:57:31 -0400
committerMichael Chapman <michapma@redhat.com>2016-10-19 03:02:13 -0400
commit0194f88e4dcea026795fc8e674566f6cae7971a0 (patch)
treed2759642561656af86f2b90adb77182b639acd06
parent1513de7f3d75e93b83ebc88b0d40880985f67400 (diff)
Use correct OVS version for SFC
JIRA: APEX-334 This regressed when we moved over to installing the replacement ovs at runtime instead of build time Change-Id: I0fec6b68be56a3aa41e502c2e09375aca34be22c Signed-off-by: Michael Chapman <michapma@redhat.com> (cherry picked from commit ed1361c3ddfb3633850759386daafae42b4c859c)
-rwxr-xr-xlib/overcloud-deploy-functions.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index c1cb74f..a6c4387 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -109,12 +109,6 @@ EOF
-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
@@ -126,6 +120,15 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex"
fi
+ # upgrade ovs into ovs 2.5.90 with NSH function if SFC is enabled
+ if [ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['dataplane']}" == 'ovs' ]; then
+ 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
+
# Set ODL version accordingly
if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI