openstack/nova
Code Issues Proposed changes

Remove deprecated neutron options

Browse Source 
These were deprecated back in Kilo:

caeffad8e7

Change-Id: Ice5464a92f65ff030785e357f65a8680789e3e12
This commit is contained in:
Matt Riedemann
2016-08-31 11:19:43 -04:00
parent dd44096a04
commit efe193ceed
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nova/conf/neutron.py
View File

@@ -105,13 +105,6 @@ Related options:
ALL_OPTS = (neutron_opts + metadata_proxy_opts) ALL_OPTS = (neutron_opts + metadata_proxy_opts)
deprecations = {'cafile': [cfg.DeprecatedOpt('ca_certificates_file',
group=NEUTRON_GROUP)],
'insecure': [cfg.DeprecatedOpt('api_insecure',
group=NEUTRON_GROUP)],
'timeout': [cfg.DeprecatedOpt('url_timeout',
group=NEUTRON_GROUP)]}
def _gen_opts_from_plugins(): def _gen_opts_from_plugins():
opts = copy.deepcopy(neutron_options) opts = copy.deepcopy(neutron_options)
@@ -136,7 +129,7 @@ def register_opts(conf):
conf.register_group(neutron_group) conf.register_group(neutron_group)
conf.register_opts(ALL_OPTS, group=neutron_group) conf.register_opts(ALL_OPTS, group=neutron_group)
neutron_options = ks_loading.register_session_conf_options( neutron_options = ks_loading.register_session_conf_options(
conf, NEUTRON_GROUP, deprecated_opts=deprecations) conf, NEUTRON_GROUP)
ks_loading.register_auth_conf_options(conf, NEUTRON_GROUP) ks_loading.register_auth_conf_options(conf, NEUTRON_GROUP)

9
releasenotes/notes/rm-deprecated-neutron-opts-newton-a09ecfb0775339e6.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
upgrade:
- |
The following deprecated configuration options have been removed from the
``neutron`` section of nova.conf:
- ca_certificates_file
- api_insecure
- url_timeout