Merge " Fix swiftclient 400 error when OS_AUTH_URL is set."
This commit is contained in:
commit
a99a37f7f6
@ -1007,8 +1007,7 @@ def parse_args(parser, args, enforce_requires=True):
|
|||||||
args = ['-h']
|
args = ['-h']
|
||||||
(options, args) = parser.parse_args(args)
|
(options, args) = parser.parse_args(args)
|
||||||
|
|
||||||
if (not (options.auth and options.user and options.key) or
|
if (not (options.auth and options.user and options.key)):
|
||||||
options.os_auth_url):
|
|
||||||
# Use 2.0 auth if none of the old args are present
|
# Use 2.0 auth if none of the old args are present
|
||||||
options.auth_version = '2.0'
|
options.auth_version = '2.0'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user