aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-keystone
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/salt-formula-keystone
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/salt-formula-keystone')
-rw-r--r--mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch28
1 files changed, 28 insertions, 0 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
new file mode 100644
index 000000000..ba7450260
--- /dev/null
+++ b/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
@@ -0,0 +1,28 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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(