From 1746232d6067088eb2a6bd83eb6e059f28088119 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 22 Jan 2019 12:53:07 +0400 Subject: Pass domain name properly for heat stack user Change-Id: I74c1c85310e2012e664764b6129fc4a52faaf106 Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 -- mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 2 -- 2 files changed, 4 deletions(-) (limited to 'mcp/reclass/classes/cluster') 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 9e862febd..0770f5c45 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,8 +117,6 @@ 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 e1ae1e054..d36d5830a 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,8 +147,6 @@ parameters: address: ${_param:single_address} api_cloudwatch: address: ${_param:single_address} - stack_domain_admin: - domain: heat_user_domain mysql: server: version: '5.7' -- cgit 1.2.3-korg