diff --git a/nova/conf/neutron.py b/nova/conf/neutron.py index 7a17d63dd8..1b04ffafef 100644 --- a/nova/conf/neutron.py +++ b/nova/conf/neutron.py @@ -105,13 +105,6 @@ Related options: 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(): opts = copy.deepcopy(neutron_options) @@ -136,7 +129,7 @@ def register_opts(conf): conf.register_group(neutron_group) conf.register_opts(ALL_OPTS, group=neutron_group) 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) diff --git a/releasenotes/notes/rm-deprecated-neutron-opts-newton-a09ecfb0775339e6.yaml b/releasenotes/notes/rm-deprecated-neutron-opts-newton-a09ecfb0775339e6.yaml new file mode 100644 index 0000000000..3cfac52852 --- /dev/null +++ b/releasenotes/notes/rm-deprecated-neutron-opts-newton-a09ecfb0775339e6.yaml @@ -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