From 8badc32b6e87e925b198fa778c426265be86586b Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Wed, 26 Oct 2016 09:22:12 -0400 Subject: Adding OVN as an SDN option to Apex JIRA: APEX-129 opnfv-tht-pr: 111 opnfv-puppet-tripleo-pr: 18 Change-Id: I71de5802ed476b6f78ad5a718ac15d9aec9a6a1d Signed-off-by: Dan Radez --- lib/overcloud-deploy-functions.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'lib') diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 8f5b1a21..ec03aaa7 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -55,6 +55,15 @@ function overcloud_deploy { # DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml" #fi #SDN_IMAGE=onos + elif [ "${deploy_options_array['sdn_controller']}" == 'ovn' ]; then + if [[ "$ha_enabled" == "True" ]]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-ovn-ha.yaml" + echo "${red}OVN HA support is not not supported... exiting.${reset}" + exit 1 + else + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-ovn.yaml" + fi + SDN_IMAGE=opendaylight elif [ "${deploy_options_array['sdn_controller']}" == 'opencontrail' ]; then echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}" exit 1 @@ -256,6 +265,17 @@ EOI DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" fi + if [ "${deploy_options_array['sdn_controller']}" == 'ovn' ]; then + # The epoch in deloran's ovs is 1: and in leif's is 0: + # so we have to execute a downgrade instead of an update + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <