[odl] Add SDN_CONTROLLER_IP to openrc

JIRA: FUEL-352

Change-Id: I73aa5d41e93f3ebd5c8e44577868e8d21e0106a9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
index c50f5b2..0820d8b 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml
@@ -16,3 +16,10 @@ parameters:
     server:
       backend:
         enable_websocket: false
+  keystone:
+    server:
+      openrc_extra:
+        # For HA, all public services are available through nginx on prx
+        sdn_controller_ip: ${_param:cluster_public_host}
+        sdn_username: admin  # Hardcoded to default ODL values for now
+        sdn_password: admin

diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
index 66c9322..8798589 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml
@@ -40,3 +40,10 @@ parameters:
     server:
       backend:
         enable_websocket: false
+  keystone:
+    server:
+      openrc_extra:
+        # For noHA, all public services are available through haproxy on ctl
+        sdn_controller_ip: ${_param:cluster_vip_address}
+        sdn_username: admin  # Hardcoded to default ODL values for now
+        sdn_password: admin