From fb15c00aa1561973804819d111d52b6d25842293 Mon Sep 17 00:00:00 2001 From: Augustina Ragwitz Date: Wed, 31 Aug 2016 09:45:15 -0700 Subject: [PATCH] Remove deprecated cinder options These were deprecated in Kilo: 49192695423b949be0e914dee47695db30636280 Change-Id: I8a5f9db5ad951288ec99d0f6c7adfa5fb675e289 --- nova/conf/cinder.py | 10 +--------- ...recated-cinder-options-newton-fc3dce6856101ef8.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-cinder-options-newton-fc3dce6856101ef8.yaml 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