Skip trying to set project_domain_id if not using password

Steve Martinelli · Steve Martinelli · commit aac0d588bd83 · 2015-06-11T02:43:57.000-04:00
This is already fine for user_domain_id, and needs to be replicated
for project_domain_id. Also added more logging.

Change-Id: I3fa8f29edb3fc430d453bd0fc835312c0c8401f4
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
@@ -138,6 +138,7 @@ def setup_auth(self):
         # present, then do not change the behaviour. Otherwise, set the
         # PROJECT_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('project_domain_id', None) and
             not self.auth_plugin_name.startswith('v2') and
                 not self._auth_params.get('project_domain_name', None)):
@@ -160,6 +161,7 @@ def setup_auth(self):
             self._project_name = self._auth_params['tenant_name']
 
         LOG.info('Using auth plugin: %s' % self.auth_plugin_name)
+        LOG.debug('Using parameters %s' % self._auth_params)
         self.auth = auth_plugin.load_from_options(**self._auth_params)
         # needed by SAML authentication
         request_session = requests.session()
