From: Tim Rozet <trozet@redhat.com>
Date: Thu, 26 Jan 2017 17:18:24 +0000 (-0500)
Subject: Enables OpenDaylight clustering in HA deployments
X-Git-Tag: opnfv-6.0.0~886^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=45c909a0010d01b3ed6fe02fe35741555e832c87;p=apex-tripleo-heat-templates.git

Enables OpenDaylight clustering in HA deployments

Port 2550 is required for inter-ODL communication when clustering.
odl-jolokia feature is required to expose REST APIs from ODL for
monitoring the cluster.

Implements: blueprint opendaylight-ha

Depends-On: Ic9a955a1c2afc040b2f9c6fb86573c04a60f9f31

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

diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml
index 0ed9d206..06bb84a8 100644
--- a/puppet/services/opendaylight-api.yaml
+++ b/puppet/services/opendaylight-api.yaml
@@ -24,7 +24,7 @@ parameters:
   OpenDaylightFeatures:
     description: List of features to install with ODL
     type: comma_delimited_list
-    default: ["odl-netvirt-openstack","odl-netvirt-ui"]
+    default: ["odl-netvirt-openstack","odl-netvirt-ui","odl-jolokia"]
   OpenDaylightApiVirtualIP:
     type: string
     default: ''
@@ -61,5 +61,6 @@ outputs:
                   - {get_param: OpenDaylightPort}
                   - 6640
                   - 6653
+                  - 2550
       step_config: |
         include tripleo::profile::base::neutron::opendaylight
diff --git a/releasenotes/notes/add-opendaylight-ha-e46ef46e29689dde.yaml b/releasenotes/notes/add-opendaylight-ha-e46ef46e29689dde.yaml
new file mode 100644
index 00000000..882ee4e5
--- /dev/null
+++ b/releasenotes/notes/add-opendaylight-ha-e46ef46e29689dde.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - Adds support for OpenDaylight HA clustering.  Now when specifying
+    three or more ODL roles, ODL will be deployed in a cluster, and
+    use port 2550 for cluster communication.