Merge "Python 3 compatibility: fix has_key"
This commit is contained in:
commit
cb86cc0a33
@ -144,7 +144,7 @@ def create_nova_connection(options):
|
|||||||
insecure=options["insecure"],
|
insecure=options["insecure"],
|
||||||
region_name=region,
|
region_name=region,
|
||||||
session=keystone_session, auth=keystone_auth,
|
session=keystone_session, auth=keystone_auth,
|
||||||
http_log_debug=options.has_key("verbose"),
|
http_log_debug="verbose" in options,
|
||||||
endpoint_type=nova_endpoint_type)
|
endpoint_type=nova_endpoint_type)
|
||||||
else:
|
else:
|
||||||
# OSP >= Ocata
|
# OSP >= Ocata
|
||||||
@ -152,7 +152,7 @@ def create_nova_connection(options):
|
|||||||
nova = client.Client(version,
|
nova = client.Client(version,
|
||||||
region_name=region,
|
region_name=region,
|
||||||
session=keystone_session, auth=keystone_auth,
|
session=keystone_session, auth=keystone_auth,
|
||||||
http_log_debug=options.has_key("verbose"),
|
http_log_debug="verbose" in options,
|
||||||
endpoint_type=nova_endpoint_type)
|
endpoint_type=nova_endpoint_type)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
Loading…
Reference in New Issue
Block a user