Merge "Pass OS_ENDPOINT_TYPE from shell to client"

This commit is contained in:
Jenkins 2015-11-30 20:00:23 +00:00 committed by Gerrit Code Review
commit 491e63b4bc
2 changed files with 3 additions and 1 deletions

View File

@ -32,6 +32,7 @@ class Command(CliffCommand):
self.client = Client(
region_name=self.app.options.os_region_name,
service_type=self.app.options.os_service_type,
endpoint_type=self.app.options.os_endpoint_type,
session=self.app.session,
all_tenants=self.app.options.all_tenants,
edit_managed=self.app.options.edit_managed,

View File

@ -146,7 +146,8 @@ class DesignateShell(App):
'Defaults to env[OS_DNS_ENDPOINT].')
parser.add_argument('--os-endpoint-type',
default=env('OS_ENDPOINT_TYPE'),
default=env('OS_ENDPOINT_TYPE',
default='publicURL'),
help='Defaults to env[OS_ENDPOINT_TYPE].')
parser.add_argument('--os-service-type',