From e8905d1c928a2e674ff399d96384466572f985b3 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 5 Jul 2019 12:00:12 +0400 Subject: [virtual] Update OpenStack version to Stein Change-Id: I9c1e97144ffd46040d32a0edf8253fc393b73c89 Signed-off-by: Michael Polenchuk --- ...003-Define-keystone-domain-for-heat-stack.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch (limited to 'mcp/patches/reclass-system-salt-model') 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 deleted file mode 100644 index 645c9bbdb..000000000 --- a/mcp/patches/reclass-system-salt-model/0003-Define-keystone-domain-for-heat-stack.patch +++ /dev/null @@ -1,45 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 -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..25d16e18 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: -+ description: 'Contains users and projects created by heat' - roles: - heat_stack_user: - name: heat_stack_user -@@ -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 -+ domain_id: heat - services: - heat: - type: orchestration -- cgit 1.2.3-korg