aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-keystone
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/salt-formula-keystone
parent45c9f16e592d5d205d55189baef5fb5c01c8a6fc (diff)
[virtual] Update OpenStack version to Stein
Change-Id: I9c1e97144ffd46040d32a0edf8253fc393b73c89 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/salt-formula-keystone')
-rw-r--r--mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch b/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
deleted file mode 100644
index ba7450260..000000000
--- a/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
+++ /dev/null
@@ -1,28 +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: Tue, 22 Jan 2019 12:43:12 +0400
-Subject: [PATCH] Get domain id instead of name for user_create
-
-diff --git a/_states/keystonev3.py b/_states/keystonev3.py
-index 2dd651d..46aed30 100644
---- a/_states/keystonev3.py
-+++ b/_states/keystonev3.py
-@@ -237,6 +237,11 @@ def user_present(name, cloud_name, password_reset=False, **kwargs):
- 'project_get_details', kwargs['default_project_id'],
- cloud_name=cloud_name)['project']['id']
-
-+ if 'domain_id' in kwargs:
-+ kwargs['domain_id'] = _keystonev3_call(
-+ 'domain_get_details', kwargs['domain_id'],
-+ cloud_name=cloud_name)['domain']['id']
-+
- if not users:
- try:
- resp = _keystonev3_call(