From c9503ee1b3e3748c69ec8131dc6dd37289eb3b28 Mon Sep 17 00:00:00 2001 From: aviau Date: Wed, 17 Jun 2015 09:03:13 -0400 Subject: [PATCH] Added proper SURVEIL_API_URL and SURVEIL_AUTH_URL defaults Change-Id: I000f8864e83f2087a20a32f32ebf11f79d254e27 --- surveilclient/shell.py | 4 +++- surveilclient/v2_0/client.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/surveilclient/shell.py b/surveilclient/shell.py index 8705c03..21825bc 100644 --- a/surveilclient/shell.py +++ b/surveilclient/shell.py @@ -47,7 +47,9 @@ class SurveilShell(object): parser.add_argument('-h', '--help', action='store_true') parser.add_argument('--surveil-api-url', - default=utils.env('SURVEIL_API_URL'), + default=utils.env( + 'SURVEIL_API_URL', + default='http://localhost:8080/v2'), help='Defaults to env[SURVEIL_API_URL].') parser.add_argument('--surveil-api-version', diff --git a/surveilclient/v2_0/client.py b/surveilclient/v2_0/client.py index 4be5c15..d831267 100644 --- a/surveilclient/v2_0/client.py +++ b/surveilclient/v2_0/client.py @@ -37,7 +37,7 @@ class Client(object): if auth_url is None: auth_url = os.environ.get( 'SURVEIL_AUTH_URL', - os.environ.get('OS_AUTH_URL', None) + os.environ.get('OS_AUTH_URL', endpoint + '/auth') ) if auth_url is None: raise Exception("Must specify auth url")