Merge "Set tenant options on parsed namespace"

1 files changed, 2 insertions, 0 deletions

diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 85e367c4..6311c71a 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -139,6 +139,7 @@ class ClientManager(object):
         # PROJECT_DOMAIN_ID to 'OS_DEFAULT_DOMAIN' for better usability.
         if (self._api_version.get('identity') == '3' and
             not self._auth_params.get('project_domain_id', None) and
+            not self.auth_plugin_name.startswith('v2') and
                 not self._auth_params.get('project_domain_name', None)):
             self._auth_params['project_domain_id'] = default_domain
 
@@ -147,6 +148,7 @@ class ClientManager(object):
         # 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_plugin_name.startswith('v2') and
             not self._auth_params.get('user_domain_id', None) and
                 not self._auth_params.get('user_domain_name', None)):
             self._auth_params['user_domain_id'] = default_domain