Remove "--os-identity-api-version" argument

Following commits:
  Change 608808
  Change 604284
  Use keystoneauth1.load.get_plugin_loader to load and discovery dynamically
without explicitly specifying V2 or V3 of keystone.

  The argument of "--os-identity-api-version" is no longer required.

Change-Id: Idbd324d30489ae3c6a279e7147387fea81f39063
This commit is contained in:
Cai Hui 2018-10-19 07:18:48 -04:00
parent 2614d6de09
commit 5fd8f1bbb1
4 changed files with 2 additions and 20 deletions

View File

@ -25,7 +25,6 @@ freezer usage
[--os-auth-url OS_AUTH_URL] [--os-backup-url OS_BACKUP_URL]
[--os-backup-api-version OS_BACKUP_API_VERSION]
[--os-endpoint-type OS_ENDPOINT_TYPE]
[--os-identity-api-version OS_IDENTITY_API_VERSION]
[--os-password OS_PASSWORD] [--os-username OS_USERNAME]
[--os-token OS_TOKEN]
[--os-project-domain-name OS_PROJECT_DOMAIN_NAME]
@ -74,9 +73,6 @@ freezer optional arguments
"public" or "publicURL", "internal" or "internalURL",
"admin" or "adminURL"
``--os-identity-api-version OS_IDENTITY_API_VERSION``
Identity API version: 2.0 or 3
``--os-password OS_PASSWORD``
Password used for authentication with the OpenStack
Identity service

View File

@ -122,13 +122,6 @@ class FreezerShell(app.App):
"admin" or "adminURL"'''
)
parser.add_argument(
'--os-identity-api-version',
dest='os_identity_api_version',
default=os.environ.get('OS_IDENTITY_API_VERSION'),
help='Identity API version: 2.0 or 3'
)
parser.add_argument(
'--os-password',
dest='os_password',
@ -241,7 +234,6 @@ class FreezerShell(app.App):
"""
opts = {
'token': self.options.os_token,
'version': self.options.os_identity_api_version,
'username': self.options.os_username,
'password': self.options.os_password,
'tenant_name': self.options.os_project_name,

View File

@ -30,7 +30,7 @@ class Client(object):
"""Client for the OpenStack Disaster Recovery v1 API.
"""
def __init__(self, version='3', token=None, username=None, password=None,
def __init__(self, token=None, username=None, password=None,
tenant_name=None, auth_url=None, session=None, endpoint=None,
endpoint_type=None, opts=None, project_name=None,
user_domain_name=None, user_domain_id=None,
@ -38,7 +38,6 @@ class Client(object):
cert=None, cacert=None, insecure=False, project_id=None):
"""
Initialize a new client for the Disaster Recovery v1 API.
:param version: keystone version to use
:param token: keystone token
:param username: openstack username
:param password: openstack password
@ -82,8 +81,6 @@ class Client(object):
self.opts.os_user_domain_id = user_domain_id or None
self.opts.os_project_domain_name = project_domain_name or None
self.opts.os_project_domain_id = project_domain_id or None
self.opts.auth_version = version
self.opts.os_identity_api_version = version
self.opts.os_cacert = cacert or None
self.opts.insecure = insecure
self.opts.cert = cert

View File

@ -30,7 +30,7 @@ class Client(object):
"""Client for the OpenStack Disaster Recovery v1 API.
"""
def __init__(self, version='3', token=None, username=None, password=None,
def __init__(self, token=None, username=None, password=None,
tenant_name=None, auth_url=None, session=None, endpoint=None,
endpoint_type=None, opts=None, project_name=None,
user_domain_name=None, user_domain_id=None,
@ -38,7 +38,6 @@ class Client(object):
cert=None, cacert=None, insecure=False, project_id=None):
"""
Initialize a new client for the Disaster Recovery v1 API.
:param version: keystone version to use
:param token: keystone token
:param username: openstack username
:param password: openstack password
@ -82,8 +81,6 @@ class Client(object):
self.opts.os_user_domain_id = user_domain_id or None
self.opts.os_project_domain_name = project_domain_name or None
self.opts.os_project_domain_id = project_domain_id or None
self.opts.auth_version = version
self.opts.os_identity_api_version = version
self.opts.os_cacert = cacert or None
self.opts.insecure = insecure
self.opts.cert = cert