diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 11:49:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 11:49:51 +0000 |
| commit | 519cbc9a671dc2849a8453e3b3b0f1e16f5752b7 (patch) | |
| tree | 04d35d2102fdffb67a3ac66d9c0ee032e419eb5b | |
| parent | b56fef2747b815e0cf4c39f5a9edb5f4fdfa494f (diff) | |
| parent | 1875667d0d75361f2e802d150650820e3a7fb919 (diff) | |
| download | python-troveclient-519cbc9a671dc2849a8453e3b3b0f1e16f5752b7.tar.gz | |
Merge "support OS_ENDPOINT_TYPE environment variable"
| -rw-r--r-- | troveclient/shell.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/troveclient/shell.py b/troveclient/shell.py index bd028e2..1de4db8 100644 --- a/troveclient/shell.py +++ b/troveclient/shell.py @@ -148,12 +148,16 @@ class OpenStackTroveShell(object): parser.add_argument('--database_service_name', help=argparse.SUPPRESS) + default_trove_endpoint_type = utils.env( + 'OS_ENDPOINT_TYPE', + default=DEFAULT_TROVE_ENDPOINT_TYPE) parser.add_argument('--endpoint-type', metavar='<endpoint-type>', default=utils.env( 'TROVE_ENDPOINT_TYPE', - default=DEFAULT_TROVE_ENDPOINT_TYPE), + default=default_trove_endpoint_type), help='Defaults to env[TROVE_ENDPOINT_TYPE] or ' + + 'env[OS_ENDPOINT_TYPE] or ' + DEFAULT_TROVE_ENDPOINT_TYPE + '.') parser.add_argument('--endpoint_type', help=argparse.SUPPRESS) |