Fix identity new endpoint_type options for old users
Recently new config options were introduced to specify the
endpoint_type for identity clients. New options are introduced
with deprecated opt of old config 'endpoint_type' which had the
default value as "publicURL" where new options has below default values.
'v2_admin_endpoint_type' - 'adminURL'
'v2_public_endpoint_type' - 'publicURL'
'v3_endpoint_type' - 'adminURL'
'v2_admin_endpoint_type' is being used for identity admin client
which previously used to have endpoint_type as 'adminURL' hard coded
(not using old config option "endpoint_type").
As 'v2_admin_endpoint_type' is also with deprecated opt of old config option,
this results to Tempest failure for old users with environment which has old
config "endpoint_type" with its default value(endpoint_type = publicURL)
because that value will be consider for 'v2_admin_endpoint_type' option.
Previously Tempest used to run successfully with setting in config as:
endpoint_type = publicURL
We should not have deprecation opt on 'v2_admin_endpoint_type' and
'v3_endpoint_type' as they are introduced with new default values and replacing
hard coded value.
'v2_public_endpoint_type' option can be kept same to serve the deprecation of
old config options.
This commit fix the above issue.
Change-Id: I5a1c181148a968e63b53ae46bb9632ad4e013315
Closes-Bug: 1484127
Related-Bug: 1490816
diff --git a/tempest/config.py b/tempest/config.py
index b5f1de1..eaf7b44 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -117,9 +117,7 @@
choices=['public', 'admin', 'internal',
'publicURL', 'adminURL', 'internalURL'],
help="The admin endpoint type to use for OpenStack Identity "
- "(Keystone) API v2",
- deprecated_opts=[cfg.DeprecatedOpt('endpoint_type',
- group='identity')]),
+ "(Keystone) API v2"),
cfg.StrOpt('v2_public_endpoint_type',
default='publicURL',
choices=['public', 'admin', 'internal',
@@ -133,9 +131,7 @@
choices=['public', 'admin', 'internal',
'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for OpenStack Identity "
- "(Keystone) API v3",
- deprecated_opts=[cfg.DeprecatedOpt('endpoint_type',
- group='identity')]),
+ "(Keystone) API v3"),
cfg.StrOpt('username',
help="Username to use for Nova API requests."),
cfg.StrOpt('tenant_name',