Fixes ODL L3 so that it now deploys correctly

Fixes:
 - opendaylight was not being installed on controllers due to missing
   param
 - controller nics were not being found due to using computes extension
   of br-ex for ODL L3 (controllers have br-ex by default)

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

diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch
index fd1cd0e..f96f125 100644 (file)
--- a/build/opnfv-tripleo-heat-templates.patch
+++ b/build/opnfv-tripleo-heat-templates.patch
@@ -1,13 +1,13 @@
-From f9cd66d8c353411b8c3b32a45ab765eaaee02fec Mon Sep 17 00:00:00 2001
+From d9b3ccc28ff57bfa4e1135cea038ac4e5318947c Mon Sep 17 00:00:00 2001
 From: Tim Rozet <tdrozet@gmail.com>
 Date: Tue, 12 Jan 2016 16:49:57 -0500
-Subject: [PATCH] Adds current opnfv patch with ODL L2/L3 and ONOS support
+Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
 
 ---
  environments/onos.yaml                             |   8 +
  environments/opendaylight-external.yaml            |  25 ++
  environments/opendaylight.yaml                     |  25 ++
- environments/opendaylight_l3.yaml                  |   8 +
+ environments/opendaylight_l3.yaml                  |   9 +
  overcloud-resource-registry-puppet.yaml            |   3 +
  overcloud-without-mergepy.yaml                     |  73 +++++
  puppet/all-nodes-config.yaml                       |   6 +
@@ -18,7 +18,7 @@ Subject: [PATCH] Adds current opnfv patch with ODL L2/L3 and ONOS support
  puppet/manifests/overcloud_controller_pacemaker.pp | 302 +++++++++++++--------
  puppet/manifests/overcloud_opendaylight.pp         |  27 ++
  puppet/opendaylight-puppet.yaml                    | 217 +++++++++++++++
- 14 files changed, 771 insertions(+), 124 deletions(-)
+ 14 files changed, 772 insertions(+), 124 deletions(-)
  create mode 100644 environments/onos.yaml
  create mode 100644 environments/opendaylight-external.yaml
  create mode 100644 environments/opendaylight.yaml
@@ -104,10 +104,10 @@ index 0000000..c8abf75
 +      opendaylight_install: true
 diff --git a/environments/opendaylight_l3.yaml b/environments/opendaylight_l3.yaml
 new file mode 100644
-index 0000000..be7c2a8
+index 0000000..ffdb017
 --- /dev/null
 +++ b/environments/opendaylight_l3.yaml
-@@ -0,0 +1,8 @@
+@@ -0,0 +1,9 @@
 +parameters:
 +    #NeutronEnableL3Agent: false
 +    NeutronEnableForceMetadata: true
@@ -116,6 +116,7 @@ index 0000000..be7c2a8
 +    ExtraConfig:
 +      neutron_mechanism_drivers: ['opendaylight']
 +      neutron_tenant_network_type: vxlan
++      opendaylight_install: true
 diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
 index 4cfed6b..adecc79 100644
 --- a/overcloud-resource-registry-puppet.yaml

diff --git a/ci/deploy.sh b/ci/deploy.sh
index e99f4b2..1ce4e18 100755 (executable)
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -651,6 +651,8 @@ function configure_network_environment {
       sed -i 's#^.*Compute::Ports::StoragePort:.*$#  OS::TripleO::Compute::Ports::StoragePort: '${tht_dir}'/ports/noop.yaml#' $1
   fi
 
+  sed -i 's#^.*Controller::Net::SoftwareConfig:.*$#  OS::TripleO::Controller::Net::SoftwareConfig: nics/controller'${nic_ext}'.yaml#' $1
+
   # check for ODL L3
   if [ ${deploy_options_array['sdn_l3']} == 'true' ]; then
       nic_ext+=_br-ex
@@ -658,7 +660,7 @@ function configure_network_environment {
 
   # 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
+
 }
 ##Copy over the glance images and instack json file
 ##params: none