From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 17 Jan 2019 13:38:23 +0000 (+0400)
Subject: Sync heat domain name with keystone defined
X-Git-Tag: opnfv-8.0.0~56^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F66455%2F1;p=fuel.git

Sync heat domain name with keystone defined

Change-Id: Ibf88f179af2570a707ade78f772342b7da23b74f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

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'