openstack
/
python-neutronclient
Code Issues Proposed changes

Merge "Don't get keystone session if using noauth"

This commit is contained in:
Jenkins 2014-10-07 23:34:15 +00:00 committed by Gerrit Code Review
parent 8115c02054 2eba58adc1
commit b5f629f38a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutronclient/shell.py
View File

@ -752,13 +752,15 @@ class NeutronShell(app.App):
raise exc.CommandError(
_("You must provide an auth url via"
" either --os-auth-url or via env[OS_AUTH_URL]"))
auth_session = self._get_keystone_session()
auth = auth_session.auth
else: # not keystone
if not self.options.os_url:
raise exc.CommandError(
_("You must provide a service URL via"
" either --os-url or env[OS_URL]"))
auth_session = self._get_keystone_session()
auth_session = None
auth = None
self.client_manager = clientmanager.ClientManager(
token=self.options.os_token,
@ -783,7 +785,7 @@ class NeutronShell(app.App):
retries=self.options.retries,
raise_errors=False,
session=auth_session,
auth=auth_session.auth,
auth=auth,
log_credentials=True)
return