[Bug #1780882 ] Adds support for endpoint type

Provides support for endpoint_type via cli and openstack
OS_ENDPOINT_TYPE environment variable for cloudpulseclient

Change-Id: I2e6b5b6460da68b5308c33c9c0353efd9c7a9682
This commit is contained in:
Sharmin Choksey 2018-07-09 18:17:05 -07:00
parent b635bae846
commit a8271f78a1
1 changed files with 7 additions and 4 deletions

View File

@ -294,9 +294,11 @@ class OpenStackCloudPulseShell(object):
metavar='<endpoint-type>',
default=cliutils.env(
'CLOUDPULSE_ENDPOINT_TYPE',
default=DEFAULT_ENDPOINT_TYPE),
help='Defaults to env[CLOUDPULSE_ENDPOINT_TYPE] or'
+ DEFAULT_ENDPOINT_TYPE + '.')
default=cliutils.env(
'OS_ENDPOINT_TYPE',
default=DEFAULT_ENDPOINT_TYPE)),
help='Defaults to env[CLOUDPULSE_ENDPOINT_TYPE] '
'or' + DEFAULT_ENDPOINT_TYPE + '.')
# NOTE(dtroyer): We can't add --endpoint_type here due to argparse
# thinking usage-list --end is ambiguous; but it
# works fine with only --endpoint-type present
@ -533,7 +535,8 @@ class OpenStackCloudPulseShell(object):
user_domain_name=args.os_user_domain_name,
cacert=cacert,
insecure=insecure,
cloudpulse_url=bypass_url)
cloudpulse_url=bypass_url,
endpoint_type=endpoint_type)
args.func(self.cs, args)