summaryrefslogtreecommitdiffstats
path: root/mcp/patches/reclass-system-salt-model
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-05 12:00:12 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-07-10 14:40:32 +0400
commite8905d1c928a2e674ff399d96384466572f985b3 (patch)
tree8bf90a223a0a89f62011780dd3a5ce9977ab145b /mcp/patches/reclass-system-salt-model
parent45c9f16e592d5d205d55189baef5fb5c01c8a6fc (diff)
[virtual] Update OpenStack version to Stein
Change-Id: I9c1e97144ffd46040d32a0edf8253fc393b73c89 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.patch45
1 files changed, 0 insertions, 45 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
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 <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..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