Added proper SURVEIL_API_URL and SURVEIL_AUTH_URL defaults
Change-Id: I000f8864e83f2087a20a32f32ebf11f79d254e27
This commit is contained in:
@@ -47,7 +47,9 @@ class SurveilShell(object):
|
|||||||
parser.add_argument('-h', '--help', action='store_true')
|
parser.add_argument('-h', '--help', action='store_true')
|
||||||
|
|
||||||
parser.add_argument('--surveil-api-url',
|
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].')
|
help='Defaults to env[SURVEIL_API_URL].')
|
||||||
|
|
||||||
parser.add_argument('--surveil-api-version',
|
parser.add_argument('--surveil-api-version',
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class Client(object):
|
|||||||
if auth_url is None:
|
if auth_url is None:
|
||||||
auth_url = os.environ.get(
|
auth_url = os.environ.get(
|
||||||
'SURVEIL_AUTH_URL',
|
'SURVEIL_AUTH_URL',
|
||||||
os.environ.get('OS_AUTH_URL', None)
|
os.environ.get('OS_AUTH_URL', endpoint + '/auth')
|
||||||
)
|
)
|
||||||
if auth_url is None:
|
if auth_url is None:
|
||||||
raise Exception("Must specify auth url")
|
raise Exception("Must specify auth url")
|
||||||
|
|||||||
Reference in New Issue
Block a user