Merge "Validate endpoint_type option at loading"

watcher/conf/aetos_client.py

@@ -24,7 +24,8 @@ aetos_client = cfg.OptGroup(name='aetos_client',
 AETOS_CLIENT_OPTS = [
     cfg.StrOpt('interface',
                default='public',
-               choices=['internal', 'public', 'admin'],
+               choices=['public', 'internal', 'admin',
+                        'publicURL', 'internalURL', 'adminURL'],
                help="Type of endpoint to use in keystoneclient."),
     cfg.StrOpt('region_name',
                help="Region in Identity service catalog to use for "

watcher/conf/cinder_client.py

@@ -27,9 +27,9 @@ CINDER_CLIENT_OPTS = [
                help='Version of Cinder API to use in cinderclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in cinderclient. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internalURL, publicURL, adminURL. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is publicURL.'),
+               help='Type of endpoint to use in cinderclient.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]

watcher/conf/glance_client.py

@@ -27,9 +27,9 @@ GLANCE_CLIENT_OPTS = [
                help='Version of Glance API to use in glanceclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in glanceclient. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internalURL, publicURL, adminURL. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is publicURL.'),
+               help='Type of endpoint to use in glanceclient.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]

watcher/conf/gnocchi_client.py

@@ -27,9 +27,9 @@ GNOCCHI_CLIENT_OPTS = [
                help='Version of Gnocchi API to use in gnocchiclient.'),
     cfg.StrOpt('endpoint_type',
                default='public',
-               help='Type of endpoint to use in gnocchi client. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internal, public, admin. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is public.'),
+               help='Type of endpoint to use in gnocchi client.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')

watcher/conf/ironic_client.py

@@ -27,9 +27,9 @@ IRONIC_CLIENT_OPTS = [
                help='Version of Ironic API to use in ironicclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in ironicclient. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internalURL, publicURL, adminURL. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is publicURL.'),
+               help='Type of endpoint to use in ironicclient.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]

watcher/conf/monasca_client.py

@@ -27,9 +27,9 @@ MONASCA_CLIENT_OPTS = [
                help='Version of Monasca API to use in monascaclient.'),
     cfg.StrOpt('interface',
                default='internal',
-               help='Type of interface used for monasca endpoint. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internal, public, admin. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is internal.'),
+               help='Type of interface used for monasca endpoint.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]

watcher/conf/neutron_client.py

@@ -27,9 +27,9 @@ NEUTRON_CLIENT_OPTS = [
                help='Version of Neutron API to use in neutronclient.'),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in neutronclient. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internalURL, publicURL, adminURL. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is publicURL.'),
+               help='Type of endpoint to use in neutronclient.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]

watcher/conf/nova_client.py

@@ -38,9 +38,9 @@ for the compute API microversion history.
 """ % clients.MIN_NOVA_API_VERSION),
     cfg.StrOpt('endpoint_type',
                default='publicURL',
-               help='Type of endpoint to use in novaclient. '
+               choices=['public', 'internal', 'admin',
-                    'Supported values: internalURL, publicURL, adminURL. '
+                        'publicURL', 'internalURL', 'adminURL'],
-                    'The default is publicURL.'),
+               help='Type of endpoint to use in novaclient.'),
     cfg.StrOpt('region_name',
                help='Region in Identity service catalog to use for '
                     'communication with the OpenStack service.')]