summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-17 17:38:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2019-01-17 17:38:09 +0000
commit6f51790b669b6d8094ac24055ef0e690913d62aa (patch)
treed4030d9c581c32ce671b6336fc4d1f95070ca29c
parentae0456292b2932f591d110fb052d480db026fbe2 (diff)
parent3be730425a314485b1237cf26a6fd677d286392b (diff)
Merge "Sync heat domain name with keystone defined"
-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'