openstack/placement
Code Issues Proposed changes

Remove deprecated [placement] opts

Browse Source 
[placement]os_region_name has been deprecated in favor of
[placement]region_name [1], and other usages removed [2].

[placement]os_interfaces has been deprecated in favor of
[placement]valid_interfaces.

This change removes the deprecated options, for the requisite time hath
elapsed.

[1] https://review.openstack.org/#/c/492247/
[2] Iea7d5d0d6907adbcb236dc43b5af7469de2ba78b

Change-Id: Ide57fecf92a22c13884b872b3007e77a059e8b08
This commit is contained in:
Eric Fried 2018-03-27 17:45:24 -05:00
parent 66c2d42ddf
commit f89a3a9238
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
nova/conf/placement.py
View File

@ -24,32 +24,6 @@ placement_group = cfg.OptGroup(
help="Configuration options for connecting to the placement API service") help="Configuration options for connecting to the placement API service")
placement_opts = [ placement_opts = [
cfg.StrOpt(
'os_region_name',
deprecated_for_removal=True,
deprecated_since='17.0.0',
deprecated_reason='Endpoint lookup uses the service catalog via '
'common keystoneauth1 Adapter configuration '
'options. Use the region_name option instead.',
help="""
Region name of this node. This is used when picking the URL in the service
catalog.
Possible values:
* Any string representing region name
"""),
cfg.StrOpt(
'os_interface',
deprecated_for_removal=True,
deprecated_since='17.0.0',
deprecated_reason='Endpoint lookup uses the service catalog via '
'common keystoneauth1 Adapter configuration '
'options. Use the valid_interfaces option instead.',
help="""
Endpoint interface for this node. This is used when picking the URL in the
service catalog.
"""),
cfg.BoolOpt( cfg.BoolOpt(
'randomize_allocation_candidates', 'randomize_allocation_candidates',
default=False, default=False,
@ -63,19 +37,11 @@ is determined.
"""), """),
] ]
deprecated_opts = {
'region_name': [cfg.DeprecatedOpt('os_region_name',
group=placement_group.name)],
'valid_interfaces': [cfg.DeprecatedOpt('os_interface',
group=placement_group.name)]
}
def register_opts(conf): def register_opts(conf):
conf.register_group(placement_group) conf.register_group(placement_group)
conf.register_opts(placement_opts, group=placement_group) conf.register_opts(placement_opts, group=placement_group)
confutils.register_ksa_opts(conf, placement_group, DEFAULT_SERVICE_TYPE, confutils.register_ksa_opts(conf, placement_group, DEFAULT_SERVICE_TYPE)
deprecated_opts=deprecated_opts)
def list_opts(): def list_opts():
@ -87,6 +53,5 @@ def list_opts():
ks_loading.get_auth_plugin_conf_options('password') + ks_loading.get_auth_plugin_conf_options('password') +
ks_loading.get_auth_plugin_conf_options('v2password') + ks_loading.get_auth_plugin_conf_options('v2password') +
ks_loading.get_auth_plugin_conf_options('v3password') + ks_loading.get_auth_plugin_conf_options('v3password') +
confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE, confutils.get_ksa_adapter_opts(DEFAULT_SERVICE_TYPE))
deprecated_opts=deprecated_opts))
} }