Compute HA: Remove workaround for Newton and older
This change removes workaround in check-run-nova-compute script which was implemented for ancient versions. Change-Id: I9250953a179ba9a81b0289bc5e1239c4e0e54784
This commit is contained in:
parent
9baa416151
commit
e04f4a6187
|
@ -119,36 +119,6 @@ def create_nova_connection(options):
|
||||||
region = None
|
region = None
|
||||||
nova_versions = [ "2.23", "2" ]
|
nova_versions = [ "2.23", "2" ]
|
||||||
for version in nova_versions:
|
for version in nova_versions:
|
||||||
clientargs = inspect.getargspec(client.Client).varargs
|
|
||||||
# Some versions of Openstack prior to Ocata only
|
|
||||||
# supported positional arguments for username,
|
|
||||||
# password, and tenant.
|
|
||||||
#
|
|
||||||
# Versions since Ocata only support named arguments.
|
|
||||||
#
|
|
||||||
# So we need to use introspection to figure out how to
|
|
||||||
# create a Nova client.
|
|
||||||
#
|
|
||||||
# Happy days
|
|
||||||
#
|
|
||||||
if clientargs:
|
|
||||||
# OSP < Ocata
|
|
||||||
# ArgSpec(args=['version', 'username', 'password', 'project_id', 'auth_url'],
|
|
||||||
# varargs=None,
|
|
||||||
# keywords='kwargs', defaults=(None, None, None, None))
|
|
||||||
nova = client.Client(version,
|
|
||||||
None, # User
|
|
||||||
None, # Password
|
|
||||||
None, # Tenant
|
|
||||||
None, # Auth URL
|
|
||||||
insecure=options["insecure"],
|
|
||||||
region_name=region,
|
|
||||||
session=keystone_session, auth=keystone_auth,
|
|
||||||
http_log_debug="verbose" in options,
|
|
||||||
endpoint_type=nova_endpoint_type)
|
|
||||||
else:
|
|
||||||
# OSP >= Ocata
|
|
||||||
# ArgSpec(args=['version'], varargs='args', keywords='kwargs', defaults=None)
|
|
||||||
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,
|
||||||
|
|
Loading…
Reference in New Issue