aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-13 19:25:41 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-03-13 19:25:41 +0100
commit7c6c58cc10c54b6d642d243ce7c63fb0a4e88e7c (patch)
treededd8a17c3b1f2470295b65e5ed76fda2351ff43 /mcp/reclass/classes
parentf288af04f48a2f8634ea4aefe7626774fde24058 (diff)
[odl] Add SDN_CONTROLLER_IP to openrc
JIRA: FUEL-352 Change-Id: I73aa5d41e93f3ebd5c8e44577868e8d21e0106a9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes')
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/control.yml7
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-odl-noha/openstack/control.yml7
2 files changed, 14 insertions, 0 deletions
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 c50f5b2cc..0820d8bf5 100644
--- 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 66c9322f0..8798589c3 100644
--- 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