stackforge/python-libraclient
Code Issues Proposed changes

Make env vars work

Browse Source 
Change-Id: I66b3db4fe8a8338a27e550071450b3d96643e3fd
This commit is contained in:
Andrew Hutchings
2013-01-23 11:52:11 -08:00
parent 4afbb000db
commit 41bed1fe44
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraclient/clientoptions.py
View File

@@ -26,35 +26,30 @@ class ClientOptions(object):
self.options.add_argument( self.options.add_argument(
'--os_auth_url', '--os_auth_url',
metavar='<auth-url>', metavar='<auth-url>',
required=True,
default=utils.env('OS_AUTH_URL', 'LIBRA_URL'), default=utils.env('OS_AUTH_URL', 'LIBRA_URL'),
help='Authentication URL' help='Authentication URL'
) )
self.options.add_argument( self.options.add_argument(
'--os_username', '--os_username',
metavar='<auth-user-name>', metavar='<auth-user-name>',
required=True,
default=utils.env('OS_USERNAME', 'LIBRA_USERNAME'), default=utils.env('OS_USERNAME', 'LIBRA_USERNAME'),
help='Authentication username' help='Authentication username'
) )
self.options.add_argument( self.options.add_argument(
'--os_password', '--os_password',
metavar='<auth-password>', metavar='<auth-password>',
required=True,
default=utils.env('OS_PASSWORD', 'LIBRA_PASSWORD'), default=utils.env('OS_PASSWORD', 'LIBRA_PASSWORD'),
help='Authentication password' help='Authentication password'
) )
self.options.add_argument( self.options.add_argument(
'--os_tenant_name', '--os_tenant_name',
metavar='<auth-tenant-name>', metavar='<auth-tenant-name>',
required=True,
default=utils.env('OS_TENANT_NAME', 'LIBRA_PROJECT_ID'), default=utils.env('OS_TENANT_NAME', 'LIBRA_PROJECT_ID'),
help='Authentication tenant' help='Authentication tenant'
) )
self.options.add_argument( self.options.add_argument(
'--os_region_name', '--os_region_name',
metavar='<region-name>', metavar='<region-name>',
required=True,
default=utils.env('OS_REGION_NAME', 'LIBRAL_REGION_NAME'), default=utils.env('OS_REGION_NAME', 'LIBRAL_REGION_NAME'),
help='Authentication region' help='Authentication region'
) )