diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-01-14 17:18:50 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-01-16 14:48:04 +0400 |
| commit | 355c38a157ae6972d73357f088ec5223da0b6362 (patch) | |
| tree | 9e0246d089c51e3b9a1029c95106970b28688ef2 /mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch | |
| parent | b9e7d9baa57594b7627556c0429ae17328f33a4d (diff) | |
Align patches
* patch is merged into oslo-templates
* rocky repo key name is made as for others
* jinja package is updated to fix incorrect quoted value
[https://github.com/saltstack/salt/issues/46594]
Change-Id: Ia6359cf89579b4d892ae40c4d087168edcd86ebb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch')
| -rw-r--r-- | mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch | 44 |
1 files changed, 44 insertions, 0 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 new file mode 100644 index 000000000..1da54c6ce --- /dev/null +++ b/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch @@ -0,0 +1,44 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2019 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Michael Polenchuk <mpolenchuk@mirantis.com> +Date: Wed, 9 Jan 2019 15:36:36 +0400 +Subject: [PATCH] Define keystone domain for heat stack + +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 +--- a/keystone/client/v3/service/heat.yml ++++ b/keystone/client/v3/service/heat.yml +@@ -6,6 +6,9 @@ parameters: + client: + resources: + v3: ++ domains: ++ heat_user_domain: ++ description: 'Contains users and projects created by heat' + roles: + heat_stack_user: + name: heat_stack_user +@@ -21,6 +24,14 @@ parameters: + service_admin: + name: admin + project_id: service ++ heat_domain_admin: ++ 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 + services: + heat: + type: orchestration |