From 4771feb7c4af6f718efb2a687c99b3bf5387bb2f Mon Sep 17 00:00:00 2001
From: Igor_Bolotin <igor_bolotin@symantec.com>
Date: Thu, 5 Feb 2015 20:14:51 -0800
Subject: [PATCH] Adding default user_domain_id parameter only when using
 password auth

Change-Id: I31943739cc1b535cbd402c5e9245b2f7a19cfa32
Closes-Bug: #1418810
---
 openstackclient/common/clientmanager.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 2908c8ff0a..974936f899 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -114,6 +114,7 @@ class ClientManager(object):
         # then do not change the behaviour. Otherwise, set the USER_DOMAIN_ID
         # to 'OS_DEFAULT_DOMAIN' for better usability.
         if (self._api_version.get('identity') == '3' and
+            self.auth_plugin_name.endswith('password') and
             not self._auth_params.get('user_domain_id') and
                 not self._auth_params.get('user_domain_name')):
             self._auth_params['user_domain_id'] = default_domain