Merge "Adding OVN as an SDN option to Apex"

diff --combined lib/overcloud-deploy-functions.sh
index 1dc819d,ec03aaa..37e8229
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -55,6 -55,15 +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
@@@ -112,9 -121,6 +121,9 @@@ EO
        echo -e "${blue}INFO: Enabling ZRPC and Quagga${reset}"
        ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
        LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y install /root/quagga/*.rpm" \
 +                                               --run-command "sudo usermod -a -G quaggavt quagga" \
 +                                               --run-command "sudo mkdir -p /var/run/quagga/" \
 +                                               --run-command "sudo chown quagga:quagga -R /var/run/quagga/" \
                                                 --run-command "systemctl enable zrpcd" \
                                                 -a overcloud-full.qcow2
  EOI
@@@ -172,15 -178,6 +181,15 @@@ EO
        LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /usr/lib/python2.7/site-packages/ && patch -p1 < neutron-patch-NSDriver.patch" \
                                                 -a overcloud-full.qcow2
  EOI
 +
 +    # Disable clustering for ODL FDIO HA scenarios
 +    if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
 +      ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 +      LIBGUESTFS_BACKEND=direct virt-customize --run-command "cd /etc/puppet/modules/tripleo/ && patch -p1 < disable_odl_clustering.patch" \
 +                                               -a overcloud-full.qcow2
 +EOI
 +    fi
 +
      # Configure routing node for odl_l3-fdio
      if [[ "${deploy_options_array['sdn_l3']}" == 'True' ]]; then
        ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
@@@ -268,6 -265,17 +277,17 @@@ EO
      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" <<EOI
+       LIBGUESTFS_BACKEND=direct virt-customize \
+         --run-command "cd /root/ovs27 && yum update -y *openvswitch*" \
+         --run-command "cd /root/ovs27 && yum downgrade -y *openvswitch*" \
+         -a overcloud-full.qcow2
+ EOI
+   fi
+ 
    # get number of nodes available in inventory
    num_control_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "grep -c profile:control /home/stack/instackenv.json")
    num_compute_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "grep -c profile:compute /home/stack/instackenv.json")