Adds ODL L3 and external network support on compute nodes

Adds support for ODL L3 which uses DVR (distributed virtual routing).
Due to DVR compute nodes must have br-ex.  In addition, neutron must
force metadata via dhcp agent, since there is no neutron L3 agent
running.  ODL L3 runs as custom plugin to neutron.

Also adds support for configuring IP on public NIC now by default.  This
is needed for ONOS deployment, and access via public interface.

Change-Id: I5df0e49bd903efacf8c87486da27576b01ce5779
Signed-off-by: Tim Rozet <trozet@redhat.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 6ac6aff9..e99f4b27 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -651,6 +651,11 @@ function configure_network_environment {
       sed -i 's#^.*Compute::Ports::StoragePort:.*$#  OS::TripleO::Compute::Ports::StoragePort: '${tht_dir}'/ports/noop.yaml#' $1
   fi
 
+  # check for ODL L3
+  if [ ${deploy_options_array['sdn_l3']} == 'true' ]; then
+      nic_ext+=_br-ex
+  fi
+
   # set nics appropriately
   sed -i 's#^.*Compute::Net::SoftwareConfig:.*$#  OS::TripleO::Compute::Net::SoftwareConfig: nics/compute'${nic_ext}'.yaml#' $1
   sed -i 's#^.*Controller::Net::SoftwareConfig:.*$#  OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1
@@ -764,9 +769,12 @@ sleep 15
 ##preping it for deployment and launch the deploy
 ##params: none
 function undercloud_prep_overcloud_deploy {
-  # TODO ADD ODL L3 logic here
   if [[ ${#deploy_options_array[@]} -eq 0 || ${deploy_options_array['sdn_controller']} == 'opendaylight' ]]; then
-    DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
+    if [ ${deploy_options_array['sdn_l3']} == 'true' ]; then
+      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml"
+    else
+      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
+    fi
   elif [ ${deploy_options_array['sdn_controller']} == 'opendaylight-external' ]; then
     DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml"
   elif [ ${deploy_options_array['sdn_controller']} == 'onos' ]; then
@@ -798,6 +806,8 @@ function undercloud_prep_overcloud_deploy {
      DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
   fi
 
+  echo -e "${blue}INFO: Deploy options set:\n${DEPLOY_OPTIONS}${reset}"
+
   ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
 source stackrc
 set -o errexit