openstack/python-novaclient
Code Issues Proposed changes

more work towards standardize config

Browse Source 
Change-Id: I63ca85c56a61b8412bdc8bf30d6a179b134faff4
blueprint: cli-auth
This commit is contained in:
Jesse Andrews 2011-12-21 09:59:01 -08:00
parent 26ba43db9d
commit 68d0abb061
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
novaclient/shell.py
View File

@ -85,8 +85,8 @@ class OpenStackComputeShell(object):
help=argparse.SUPPRESS)
parser.add_argument('--username',
default=env('OS_USER_NAME', 'NOVA_USERNAME'),
help='Defaults to env[OS_USER_NAME].')
default=env('OS_USERNAME', 'NOVA_USERNAME'),
help='Defaults to env[OS_USERNAME].')
parser.add_argument('--apikey',
default=env('NOVA_API_KEY'),
@ -253,12 +253,12 @@ class OpenStackComputeShell(object):
if not user:
raise exc.CommandError("You must provide a username, either "
"via --username or via "
"env[NOVA_USERNAME]")
"env[OS_USERNAME]")
if not password:
if not apikey:
raise exc.CommandError("You must provide a password, "
"either via --password or via env[NOVA_PASSWORD]")
"either via --password or via env[OS_PASSWORD]")
else:
password = apikey