aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-17 17:38:23 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-17 17:40:14 +0400
commit3be730425a314485b1237cf26a6fd677d286392b (patch)
treebcb68d18f23b41ad53787635099718e22c9c63e8
parent50afe2ca1c8cd4e0c8d888d56ac67caab51e82bb (diff)
Sync heat domain name with keystone defined
Change-Id: Ibf88f179af2570a707ade78f772342b7da23b74f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j22
2 files changed, 4 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
index 0770f5c45..9e862febd 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2
@@ -117,6 +117,8 @@ parameters:
host: ${_param:openstack_proxy_control_address}
port: 8003
protocol: http
+ stack_domain_admin:
+ domain: heat_user_domain
{%- else %}
libvirt:
server:
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index d36d5830a..e1ae1e054 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -147,6 +147,8 @@ parameters:
address: ${_param:single_address}
api_cloudwatch:
address: ${_param:single_address}
+ stack_domain_admin:
+ domain: heat_user_domain
mysql:
server:
version: '5.7'