Merge "[ha] Run OpenDaylight in cluster mode"

1 files changed, 19 insertions, 7 deletions

diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2
index 6301e737a..1dd02bb8a 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/openstack/init.yml.j2
@@ -10,18 +10,30 @@ classes:
   - cluster.mcp-common-ha.openstack_init
 parameters:
   _param:
+    neutron_tenant_network_types: "flat,vxlan"
+
     # opendaylight options
-    opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
+    opendaylight_service_host: ${_param:opnfv_opendaylight_server_address}
     opendaylight_rest_port: 8282
-
-    neutron_tenant_network_types: "flat,vxlan"
 {%- if conf.MCP_VCP %}
+    opendaylight_server_node01_hostname: odl01
+    opendaylight_server_node02_hostname: odl02
+    opendaylight_server_node03_hostname: odl03
+    opendaylight_server_node01_address: ${_param:opnfv_opendaylight_server_node01_address}
+    opendaylight_server_node02_address: ${_param:opnfv_opendaylight_server_node02_address}
+    opendaylight_server_node03_address: ${_param:opnfv_opendaylight_server_node03_address}
   linux:
     network:
       host:
-        odl01:
-          address: ${_param:opendaylight_service_host}
+  {%- for i in range(1, 4) %}
+        odl0{{ i }}:
+          address: ${_param:opendaylight_server_node0{{ i }}_address}
           names:
-            - ${_param:opendaylight_server_node01_hostname}
-            - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain}
+            - ${_param:opendaylight_server_node0{{ i }}_hostname}
+            - ${_param:opendaylight_server_node0{{ i }}_hostname}.${_param:cluster_domain}
+  {%- endfor %}
+{%- else %}
+    opendaylight_control_hostname: ${_param:openstack_control_node02_hostname}
+    opendaylight_server_node01_hostname: ${_param:opendaylight_control_hostname}
+    opendaylight_server_node01_address: ${_param:opnfv_openstack_control_node02_address}
 {%- endif %}