openstack/python-cinderclient
Code Issues Proposed changes

Merge "OS_TENANT_NAME is not required when we have OS_PROJECT_NAME"

Browse Source
This commit is contained in:
Jenkins 2016-07-15 20:58:19 +00:00 committed by Gerrit Code Review
commit d96cc9fc08
2 changed files with 8 additions and 3 deletions
cinderclient
shell.py
tests/functional
base.py

8
cinderclient/shell.py

@ -269,6 +269,7 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-tenant-name',
metavar='<auth-tenant-name>',
default=utils.env('OS_TENANT_NAME',
'OS_PROJECT_NAME',
'CINDER_PROJECT_ID'),
help='Tenant name. '
'Default=env[OS_TENANT_NAME].')
@ -278,6 +279,7 @@ class OpenStackCinderShell(object):
parser.add_argument('--os-tenant-id',
metavar='<auth-tenant-id>',
default=utils.env('OS_TENANT_ID',
'OS_PROJECT_ID',
'CINDER_TENANT_ID'),
help='ID for the tenant. '
'Default=env[OS_TENANT_ID].')
@ -739,8 +741,10 @@ class OpenStackCinderShell(object):
username = self.options.os_username
password = self.options.os_password
tenant_id = self.options.os_tenant_id
tenant_name = self.options.os_tenant_name
tenant_id = (self.options.os_tenant_id
or self.options.os_project_id)
tenant_name = (self.options.os_tenant_name
or self.options.os_project_name)
return v2_auth.Password(
v2_auth_url,

3
cinderclient/tests/functional/base.py

@ -34,7 +34,8 @@ def credentials():
username = os.environ.get('OS_USERNAME')
password = os.environ.get('OS_PASSWORD')
tenant_name = os.environ.get('OS_TENANT_NAME')
tenant_name = (os.environ.get('OS_TENANT_NAME')
or os.environ.get('OS_PROJECT_NAME'))
auth_url = os.environ.get('OS_AUTH_URL')
config = six.moves.configparser.RawConfigParser()