summaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-keystone/0002-Get-domain-id-instead-of-name.patch
blob: ba745026060d2d33c6c06fe9fc07b31df7d6f0ad (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
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(