Merge "python-novaclient-3.1.0+ compatibility"

This commit is contained in:
Jenkins 2016-08-02 14:55:20 +00:00 committed by Gerrit Code Review
commit 3986ef29c4
1 changed files with 1 additions and 3 deletions

View File

@ -127,9 +127,7 @@ class Nova(object):
options.command = None options.command = None
self.nova.do_help(options) self.nova.do_help(options)
sys.exit(2) sys.exit(2)
auth_token = None auth_token = getattr(args, 'os_token', None)
if options.os_auth_token and options.os_endpoint:
auth_token = options.os_auth_token
api_version = '2.1' api_version = '2.1'
nova_client = Client( nova_client = Client(
api_version, api_version,