diff --git a/nova/conf/cinder.py b/nova/conf/cinder.py index eeb8cdbe10d7..ae3f0f432b0c 100644 --- a/nova/conf/cinder.py +++ b/nova/conf/cinder.py @@ -90,20 +90,12 @@ By default there is no availability zone restriction on volume attach. """), ] -deprecated = {'timeout': [cfg.DeprecatedOpt('http_timeout', - group=cinder_group.name)], - 'cafile': [cfg.DeprecatedOpt('ca_certificates_file', - group=cinder_group.name)], - 'insecure': [cfg.DeprecatedOpt('api_insecure', - group=cinder_group.name)]} - def register_opts(conf): conf.register_group(cinder_group) conf.register_opts(cinder_opts, group=cinder_group) ks_loading.register_session_conf_options(conf, - cinder_group.name, - deprecated_opts=deprecated) + cinder_group.name) def list_opts(): diff --git a/releasenotes/notes/remove-deprecated-cinder-options-newton-fc3dce6856101ef8.yaml b/releasenotes/notes/remove-deprecated-cinder-options-newton-fc3dce6856101ef8.yaml new file mode 100644 index 000000000000..b81ee61bb2ad --- /dev/null +++ b/releasenotes/notes/remove-deprecated-cinder-options-newton-fc3dce6856101ef8.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The following deprecated configuration options have been removed from the + ``cinder`` section of nova.conf: + + - ca_certificates_file + - api_insecure + - http_timeout \ No newline at end of file