aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/reclass-system-salt-model
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-22 12:53:07 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-01-22 09:00:40 +0000
commit1746232d6067088eb2a6bd83eb6e059f28088119 (patch)
treed0c8439fe27a66914e982cbd04acff41390cbafa /mcp/patches/reclass-system-salt-model
parent89392bca9cba16093a1a3012be9b27dd69ad1162 (diff)
Pass domain name properly for heat stack user
Change-Id: I74c1c85310e2012e664764b6129fc4a52faaf106 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model')
-rw-r--r--mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
index 1da54c6ce..645c9bbdb 100644
--- a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
+++ b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch
@@ -14,7 +14,7 @@ Create domain for heat stack user by keystone state,
previously it was doing by heat-keystone-setup-domain script.
diff --git a/keystone/client/v3/service/heat.yml b/keystone/client/v3/service/heat.yml
-index 6c45bfe2..f1d500c7 100644
+index 6c45bfe2..25d16e18 100644
--- a/keystone/client/v3/service/heat.yml
+++ b/keystone/client/v3/service/heat.yml
@@ -6,6 +6,9 @@ parameters:
@@ -22,23 +22,24 @@ index 6c45bfe2..f1d500c7 100644
resources:
v3:
+ domains:
-+ heat_user_domain:
++ heat:
+ description: 'Contains users and projects created by heat'
roles:
heat_stack_user:
name: heat_stack_user
-@@ -21,6 +24,14 @@ parameters:
+@@ -21,6 +24,15 @@ parameters:
service_admin:
name: admin
project_id: service
+ heat_domain_admin:
++ domain_id: heat
+ password: ${_param:heat_domain_admin_password}
+ email: ${_param:admin_email}
+ roles:
+ heat_stack_admin:
+ name: admin
-+ role_domain_id: heat_user_domain
-+ domain_id: heat_user_domain
++ role_domain_id: heat
++ domain_id: heat
services:
heat:
type: orchestration