Adds ODL DLUX GUI to ODL L2/L3 deployments

JIRA: APEX-114

Change-Id: Id49c58c5d635a249f8d18c37dc50f350253e1b21
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 f254b7e..7105abc 100644 (file)
--- a/build/opnfv-tripleo-heat-templates.patch
+++ b/build/opnfv-tripleo-heat-templates.patch
@@ -1,4 +1,4 @@
-From 1c3aac51b3b74cc82088659e0141bfecbf4b0cc8 Mon Sep 17 00:00:00 2001
+From 69b78957a3547439398aa000598bc2fcf87b8d96 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 and ONOS support
@@ -6,8 +6,8 @@ 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                  |   9 +
+ environments/opendaylight.yaml                     |  26 ++
+ environments/opendaylight_l3.yaml                  |  10 +
  environments/opendaylight_sdnvpn.yaml              |  29 ++
  environments/opendaylight_sfc.yaml                 |  28 ++
  environments/storage-environment.yaml              |   4 +
@@ -24,7 +24,7 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
  puppet/manifests/overcloud_controller_pacemaker.pp | 487 ++++++++++++++-------
  puppet/manifests/overcloud_opendaylight.pp         |  27 ++
  puppet/opendaylight-puppet.yaml                    | 223 ++++++++++
- 20 files changed, 1292 insertions(+), 170 deletions(-)
+ 20 files changed, 1294 insertions(+), 170 deletions(-)
  create mode 100644 environments/onos.yaml
  create mode 100644 environments/opendaylight-external.yaml
  create mode 100644 environments/opendaylight.yaml
@@ -81,10 +81,10 @@ index 0000000..411df21
 +      #opendaylight_install: true
 diff --git a/environments/opendaylight.yaml b/environments/opendaylight.yaml
 new file mode 100644
-index 0000000..c8abf75
+index 0000000..ca8b226
 --- /dev/null
 +++ b/environments/opendaylight.yaml
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +# Environment file used to enable OpenDaylight
 +# Currently uses overcloud image that is assumed
 +# to be virt-customized with ODL RPM already on it
@@ -103,6 +103,7 @@ index 0000000..c8abf75
 +    # increase this if you need more ODL nodes
 +    # OpenDaylightCount: 1
 +    NeutronL3HA: false
++    OpenDaylightFeatures: "odl-ovsdb-openstack,odl-dlux-all"
 +    ExtraConfig:
 +      neutron_mechanism_drivers: ['opendaylight']
 +      neutron_tenant_network_type: vxlan
@@ -112,15 +113,16 @@ index 0000000..c8abf75
 +      opendaylight_install: true
 diff --git a/environments/opendaylight_l3.yaml b/environments/opendaylight_l3.yaml
 new file mode 100644
-index 0000000..05c0aff
+index 0000000..a902759
 --- /dev/null
 +++ b/environments/opendaylight_l3.yaml
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +parameters:
 +    #NeutronEnableL3Agent: false
 +    NeutronEnableForceMetadata: true
 +    OpenDaylightEnableL3: "'yes'"
 +    NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
++    OpenDaylightFeatures: "odl-ovsdb-openstack,odl-dlux-all"
 +    ExtraConfig:
 +      neutron_mechanism_drivers: ['opendaylight']
 +      neutron_tenant_network_type: vxlan