ODL L3 and NOSDN fixes

- taking the IP address off of br-ex in ODL L3 deployments
- leaving neutron agent installed for nosdn

These changes are on master but master has diverged from
stable/brahmaputra so they need to be committed directly
to stable/brahmaputra

JIRA: APEX-110, APEX-112

Change-Id: I8dd2a5ef4041200b13e6918d002b242cf04fc2cc
Signed-off-by: Dan Radez <dradez@redhat.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 31cd4625..01d83712 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -663,13 +663,9 @@ function configure_network_environment {
 
   sed -i 's#^.*Controller::Net::SoftwareConfig:.*$#  OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1
 
-  # check for ODL L3
+  # check for L3 Distributed Routing
   if [ "${deploy_options_array['sdn_l3']}" == 'true' ]; then
-      nic_ext+=_br-ex
-  fi
-
-  if [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then
-      nic_ext+=_no-public-ip
+      nic_ext+=_br-ex_no-public-ip
   fi
 
   # set nics appropriately