summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-24 13:10:39 +0000
committerGerrit Code Review <review@openstack.org>2018-12-24 13:10:39 +0000
commit86f71cb20d130ca60de475fd5f69d64005ae228e (patch)
tree05507284ec7c528c4f5c7ed77f199baadc8c36ae
parent1a658eb18748dedba243d1baa3d759c4ec851818 (diff)
parent198bea78ac01aaf8a703ca7878b2a85a1b59667e (diff)
Merge "Deprecate old keystone session config opts"
-rw-r--r--doc/source/configuration/tables/manila-generic.inc8
-rw-r--r--manila/common/client_auth.py3
-rw-r--r--manila/compute/nova.py32
-rw-r--r--manila/network/neutron/api.py27
-rw-r--r--manila/tests/common/test_client_auth.py16
-rw-r--r--manila/tests/compute/test_nova.py8
-rw-r--r--manila/tests/volume/test_cinder.py8
-rw-r--r--manila/volume/cinder.py33
-rw-r--r--releasenotes/notes/deprecate-old-ks-opts-in-nova-neutron-cinder-groups-e395015088d93fdc.yaml19
9 files changed, 82 insertions, 72 deletions
diff --git a/doc/source/configuration/tables/manila-generic.inc b/doc/source/configuration/tables/manila-generic.inc
index 2145793..83af944 100644
--- a/doc/source/configuration/tables/manila-generic.inc
+++ b/doc/source/configuration/tables/manila-generic.inc
@@ -90,14 +90,10 @@
90 - (String) Volume snapshot name template. 90 - (String) Volume snapshot name template.
91 * - **[cinder]** 91 * - **[cinder]**
92 - 92 -
93 * - ``api_insecure`` = ``False``
94 - (Boolean) Allow to perform insecure SSL requests to cinder.
95 * - ``auth_section`` = ``None`` 93 * - ``auth_section`` = ``None``
96 - (Unknown) Config Section from which to load plugin specific options 94 - (Unknown) Config Section from which to load plugin specific options
97 * - ``auth_type`` = ``None`` 95 * - ``auth_type`` = ``None``
98 - (Unknown) Authentication type to load 96 - (Unknown) Authentication type to load
99 * - ``ca_certificates_file`` = ``None``
100 - (String) Location of CA certificates file to use for cinder client requests.
101 * - ``cafile`` = ``None`` 97 * - ``cafile`` = ``None``
102 - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections. 98 - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
103 * - ``certfile`` = ``None`` 99 * - ``certfile`` = ``None``
@@ -130,16 +126,12 @@
130 - (Integer) Timeout value for http requests 126 - (Integer) Timeout value for http requests
131 * - **[nova]** 127 * - **[nova]**
132 - 128 -
133 * - ``api_insecure`` = ``False``
134 - (Boolean) Allow to perform insecure SSL requests to nova.
135 * - ``api_microversion`` = ``2.10`` 129 * - ``api_microversion`` = ``2.10``
136 - (String) Version of Nova API to be used. 130 - (String) Version of Nova API to be used.
137 * - ``auth_section`` = ``None`` 131 * - ``auth_section`` = ``None``
138 - (Unknown) Config Section from which to load plugin specific options 132 - (Unknown) Config Section from which to load plugin specific options
139 * - ``auth_type`` = ``None`` 133 * - ``auth_type`` = ``None``
140 - (Unknown) Authentication type to load 134 - (Unknown) Authentication type to load
141 * - ``ca_certificates_file`` = ``None``
142 - (String) Location of CA certificates file to use for nova client requests.
143 * - ``cafile`` = ``None`` 135 * - ``cafile`` = ``None``
144 - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections. 136 - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
145 * - ``certfile`` = ``None`` 137 * - ``certfile`` = ``None``
diff --git a/manila/common/client_auth.py b/manila/common/client_auth.py
index 5c84ee1..9fbea1a 100644
--- a/manila/common/client_auth.py
+++ b/manila/common/client_auth.py
@@ -50,8 +50,7 @@ class AuthClientLoader(object):
50 :param group: group name 50 :param group: group name
51 :return: list of auth default configuration 51 :return: list of auth default configuration
52 """ 52 """
53 opts = copy.deepcopy(ks_loading.register_session_conf_options( 53 opts = copy.deepcopy(ks_loading.get_session_conf_options())
54 CONF, group))
55 opts.insert(0, ks_loading.get_auth_common_conf_options()[0]) 54 opts.insert(0, ks_loading.get_auth_common_conf_options()[0])
56 55
57 for plugin_option in ks_loading.get_auth_plugin_conf_options( 56 for plugin_option in ks_loading.get_auth_plugin_conf_options(
diff --git a/manila/compute/nova.py b/manila/compute/nova.py
index 8c47024..d418a2f 100644
--- a/manila/compute/nova.py
+++ b/manila/compute/nova.py
@@ -39,16 +39,6 @@ nova_opts = [
39 deprecated_group="DEFAULT", 39 deprecated_group="DEFAULT",
40 deprecated_name="nova_api_microversion", 40 deprecated_name="nova_api_microversion",
41 help='Version of Nova API to be used.'), 41 help='Version of Nova API to be used.'),
42 cfg.StrOpt('ca_certificates_file',
43 deprecated_group="DEFAULT",
44 deprecated_name="nova_ca_certificates_file",
45 help='Location of CA certificates file to use for nova client '
46 'requests.'),
47 cfg.BoolOpt('api_insecure',
48 default=False,
49 deprecated_group="DEFAULT",
50 deprecated_name="nova_api_insecure",
51 help='Allow to perform insecure SSL requests to nova.'),
52 cfg.StrOpt('endpoint_type', 42 cfg.StrOpt('endpoint_type',
53 default='publicURL', 43 default='publicURL',
54 help='Endpoint type to be used with nova client calls.'), 44 help='Endpoint type to be used with nova client calls.'),
@@ -56,10 +46,28 @@ nova_opts = [
56 help='Region name for connecting to nova.'), 46 help='Region name for connecting to nova.'),
57 ] 47 ]
58 48
49# These fallback options can be removed in/after 9.0.0 (Train)
50deprecated_opts = {
51 'cafile': [
52 cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"),
53 cfg.DeprecatedOpt('ca_certificates_file', group=NOVA_GROUP),
54 cfg.DeprecatedOpt('nova_ca_certificates_file', group="DEFAULT"),
55 cfg.DeprecatedOpt('nova_ca_certificates_file', group=NOVA_GROUP),
56 ],
57 'insecure': [
58 cfg.DeprecatedOpt('api_insecure', group="DEFAULT"),
59 cfg.DeprecatedOpt('api_insecure', group=NOVA_GROUP),
60 cfg.DeprecatedOpt('nova_api_insecure', group="DEFAULT"),
61 cfg.DeprecatedOpt('nova_api_insecure', group=NOVA_GROUP),
62 ],
63}
64
59CONF = cfg.CONF 65CONF = cfg.CONF
60CONF.register_opts(core_opts) 66CONF.register_opts(core_opts)
61CONF.register_opts(nova_opts, NOVA_GROUP) 67CONF.register_opts(nova_opts, NOVA_GROUP)
62ks_loading.register_session_conf_options(CONF, NOVA_GROUP) 68ks_loading.register_session_conf_options(CONF,
69 NOVA_GROUP,
70 deprecated_opts=deprecated_opts)
63ks_loading.register_auth_conf_options(CONF, NOVA_GROUP) 71ks_loading.register_auth_conf_options(CONF, NOVA_GROUP)
64 72
65 73
@@ -76,8 +84,6 @@ def novaclient(context):
76 cfg_group=NOVA_GROUP) 84 cfg_group=NOVA_GROUP)
77 return AUTH_OBJ.get_client(context, 85 return AUTH_OBJ.get_client(context,
78 version=CONF[NOVA_GROUP].api_microversion, 86 version=CONF[NOVA_GROUP].api_microversion,
79 insecure=CONF[NOVA_GROUP].api_insecure,
80 cacert=CONF[NOVA_GROUP].ca_certificates_file,
81 endpoint_type=CONF[NOVA_GROUP].endpoint_type, 87 endpoint_type=CONF[NOVA_GROUP].endpoint_type,
82 region_name=CONF[NOVA_GROUP].region_name) 88 region_name=CONF[NOVA_GROUP].region_name)
83 89
diff --git a/manila/network/neutron/api.py b/manila/network/neutron/api.py
index 2689c2e..f607c82 100644
--- a/manila/network/neutron/api.py
+++ b/manila/network/neutron/api.py
@@ -41,23 +41,12 @@ neutron_opts = [
41 deprecated_group="DEFAULT", 41 deprecated_group="DEFAULT",
42 deprecated_name="neutron_url_timeout", 42 deprecated_name="neutron_url_timeout",
43 help='Timeout value for connecting to neutron in seconds.'), 43 help='Timeout value for connecting to neutron in seconds.'),
44 cfg.BoolOpt(
45 'api_insecure',
46 default=False,
47 deprecated_group="DEFAULT",
48 help='If set, ignore any SSL validation issues.'),
49 cfg.StrOpt( 44 cfg.StrOpt(
50 'auth_strategy', 45 'auth_strategy',
51 default='keystone', 46 default='keystone',
52 deprecated_group="DEFAULT", 47 deprecated_group="DEFAULT",
53 help='Auth strategy for connecting to neutron in admin context.'), 48 help='Auth strategy for connecting to neutron in admin context.'),
54 cfg.StrOpt( 49 cfg.StrOpt(
55 'ca_certificates_file',
56 deprecated_for_removal=True,
57 deprecated_group="DEFAULT",
58 help='Location of CA certificates file to use for '
59 'neutron client requests.'),
60 cfg.StrOpt(
61 'endpoint_type', 50 'endpoint_type',
62 default='publicURL', 51 default='publicURL',
63 help='Endpoint type to be used with neutron client calls.'), 52 help='Endpoint type to be used with neutron client calls.'),
@@ -66,6 +55,19 @@ neutron_opts = [
66 help='Region name for connecting to neutron in admin context.'), 55 help='Region name for connecting to neutron in admin context.'),
67] 56]
68 57
58# These fallback options can be removed in/after 9.0.0 (Train)
59deprecated_opts = {
60 'cafile': [
61 cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"),
62 cfg.DeprecatedOpt('ca_certificates_file', group=NEUTRON_GROUP),
63 ],
64 'insecure': [
65 cfg.DeprecatedOpt('api_insecure', group="DEFAULT"),
66 cfg.DeprecatedOpt('api_insecure', group=NEUTRON_GROUP),
67 ],
68}
69
70
69CONF = cfg.CONF 71CONF = cfg.CONF
70LOG = log.getLogger(__name__) 72LOG = log.getLogger(__name__)
71 73
@@ -83,7 +85,8 @@ class API(object):
83 def __init__(self, config_group_name=None): 85 def __init__(self, config_group_name=None):
84 self.config_group_name = config_group_name or 'DEFAULT' 86 self.config_group_name = config_group_name or 'DEFAULT'
85 87
86 ks_loading.register_session_conf_options(CONF, NEUTRON_GROUP) 88 ks_loading.register_session_conf_options(
89 CONF, NEUTRON_GROUP, deprecated_opts=deprecated_opts)
87 ks_loading.register_auth_conf_options(CONF, NEUTRON_GROUP) 90 ks_loading.register_auth_conf_options(CONF, NEUTRON_GROUP)
88 CONF.register_opts(neutron_opts, NEUTRON_GROUP) 91 CONF.register_opts(neutron_opts, NEUTRON_GROUP)
89 92
diff --git a/manila/tests/common/test_client_auth.py b/manila/tests/common/test_client_auth.py
index 46f3875..1ad866c 100644
--- a/manila/tests/common/test_client_auth.py
+++ b/manila/tests/common/test_client_auth.py
@@ -63,12 +63,12 @@ class ClientAuthTestCase(test.TestCase):
63 self.assertRaises(fake_client_exception_class.Unauthorized, 63 self.assertRaises(fake_client_exception_class.Unauthorized,
64 self.auth._load_auth_plugin) 64 self.auth._load_auth_plugin)
65 65
66 @mock.patch.object(auth, 'register_session_conf_options') 66 @mock.patch.object(auth, 'get_session_conf_options')
67 @mock.patch.object(auth, 'get_auth_common_conf_options') 67 @mock.patch.object(auth, 'get_auth_common_conf_options')
68 @mock.patch.object(auth, 'get_auth_plugin_conf_options') 68 @mock.patch.object(auth, 'get_auth_plugin_conf_options')
69 def test_list_opts(self, auth_conf, common_conf, register): 69 def test_list_opts(self, auth_conf, common_conf, session_conf):
70 register.return_value = [cfg.StrOpt('username'), 70 session_conf.return_value = [cfg.StrOpt('username'),
71 cfg.StrOpt('password')] 71 cfg.StrOpt('password')]
72 common_conf.return_value = ([cfg.StrOpt('auth_url')]) 72 common_conf.return_value = ([cfg.StrOpt('auth_url')])
73 auth_conf.return_value = [cfg.StrOpt('password')] 73 auth_conf.return_value = [cfg.StrOpt('password')]
74 74
@@ -80,12 +80,12 @@ class ClientAuthTestCase(test.TestCase):
80 common_conf.assert_called_once_with() 80 common_conf.assert_called_once_with()
81 auth_conf.assert_called_once_with('password') 81 auth_conf.assert_called_once_with('password')
82 82
83 @mock.patch.object(auth, 'register_session_conf_options') 83 @mock.patch.object(auth, 'get_session_conf_options')
84 @mock.patch.object(auth, 'get_auth_common_conf_options') 84 @mock.patch.object(auth, 'get_auth_common_conf_options')
85 @mock.patch.object(auth, 'get_auth_plugin_conf_options') 85 @mock.patch.object(auth, 'get_auth_plugin_conf_options')
86 def test_list_opts_not_found(self, auth_conf, common_conf, register,): 86 def test_list_opts_not_found(self, auth_conf, common_conf, session_conf):
87 register.return_value = [cfg.StrOpt('username'), 87 session_conf.return_value = [cfg.StrOpt('username'),
88 cfg.StrOpt('password')] 88 cfg.StrOpt('password')]
89 common_conf.return_value = ([cfg.StrOpt('auth_url')]) 89 common_conf.return_value = ([cfg.StrOpt('auth_url')])
90 auth_conf.return_value = [cfg.StrOpt('tenant')] 90 auth_conf.return_value = [cfg.StrOpt('tenant')]
91 91
diff --git a/manila/tests/compute/test_nova.py b/manila/tests/compute/test_nova.py
index 4b2e659..abf961f 100644
--- a/manila/tests/compute/test_nova.py
+++ b/manila/tests/compute/test_nova.py
@@ -135,8 +135,6 @@ class NovaclientTestCase(test.TestCase):
135 data = { 135 data = {
136 'nova': { 136 'nova': {
137 'api_microversion': 'foo_api_microversion', 137 'api_microversion': 'foo_api_microversion',
138 'api_insecure': True,
139 'ca_certificates_file': 'foo_ca_certificates_file',
140 'endpoint_type': 'foo_endpoint_type', 138 'endpoint_type': 'foo_endpoint_type',
141 'region_name': 'foo_region_name', 139 'region_name': 'foo_region_name',
142 } 140 }
@@ -153,8 +151,6 @@ class NovaclientTestCase(test.TestCase):
153 mock_client_loader.return_value.get_client.assert_called_once_with( 151 mock_client_loader.return_value.get_client.assert_called_once_with(
154 fake_context, 152 fake_context,
155 version=data['nova']['api_microversion'], 153 version=data['nova']['api_microversion'],
156 insecure=data['nova']['api_insecure'],
157 cacert=data['nova']['ca_certificates_file'],
158 endpoint_type=data['nova']['endpoint_type'], 154 endpoint_type=data['nova']['endpoint_type'],
159 region_name=data['nova']['region_name'], 155 region_name=data['nova']['region_name'],
160 ) 156 )
@@ -165,8 +161,6 @@ class NovaclientTestCase(test.TestCase):
165 data = { 161 data = {
166 'nova': { 162 'nova': {
167 'api_microversion': 'foo_api_microversion', 163 'api_microversion': 'foo_api_microversion',
168 'api_insecure': True,
169 'ca_certificates_file': 'foo_ca_certificates_file',
170 'endpoint_type': 'foo_endpoint_type', 164 'endpoint_type': 'foo_endpoint_type',
171 'region_name': 'foo_region_name', 165 'region_name': 'foo_region_name',
172 } 166 }
@@ -178,8 +172,6 @@ class NovaclientTestCase(test.TestCase):
178 nova.AUTH_OBJ.get_client.assert_called_once_with( 172 nova.AUTH_OBJ.get_client.assert_called_once_with(
179 fake_context, 173 fake_context,
180 version=data['nova']['api_microversion'], 174 version=data['nova']['api_microversion'],
181 insecure=data['nova']['api_insecure'],
182 cacert=data['nova']['ca_certificates_file'],
183 endpoint_type=data['nova']['endpoint_type'], 175 endpoint_type=data['nova']['endpoint_type'],
184 region_name=data['nova']['region_name'], 176 region_name=data['nova']['region_name'],
185 ) 177 )
diff --git a/manila/tests/volume/test_cinder.py b/manila/tests/volume/test_cinder.py
index c89416d..f4de6fe 100644
--- a/manila/tests/volume/test_cinder.py
+++ b/manila/tests/volume/test_cinder.py
@@ -55,8 +55,6 @@ class CinderclientTestCase(test.TestCase):
55 fake_context = 'fake_context' 55 fake_context = 'fake_context'
56 data = { 56 data = {
57 'cinder': { 57 'cinder': {
58 'api_insecure': True,
59 'ca_certificates_file': 'foo_ca_certificates_file',
60 'http_retries': 3, 58 'http_retries': 3,
61 'endpoint_type': 'foo_endpoint_type', 59 'endpoint_type': 'foo_endpoint_type',
62 'region_name': 'foo_region_name', 60 'region_name': 'foo_region_name',
@@ -73,8 +71,6 @@ class CinderclientTestCase(test.TestCase):
73 ) 71 )
74 mock_client_loader.return_value.get_client.assert_called_once_with( 72 mock_client_loader.return_value.get_client.assert_called_once_with(
75 fake_context, 73 fake_context,
76 insecure=data['cinder']['api_insecure'],
77 cacert=data['cinder']['ca_certificates_file'],
78 retries=data['cinder']['http_retries'], 74 retries=data['cinder']['http_retries'],
79 endpoint_type=data['cinder']['endpoint_type'], 75 endpoint_type=data['cinder']['endpoint_type'],
80 region_name=data['cinder']['region_name'], 76 region_name=data['cinder']['region_name'],
@@ -85,8 +81,6 @@ class CinderclientTestCase(test.TestCase):
85 fake_context = 'fake_context' 81 fake_context = 'fake_context'
86 data = { 82 data = {
87 'cinder': { 83 'cinder': {
88 'api_insecure': True,
89 'ca_certificates_file': 'foo_ca_certificates_file',
90 'http_retries': 3, 84 'http_retries': 3,
91 'endpoint_type': 'foo_endpoint_type', 85 'endpoint_type': 'foo_endpoint_type',
92 'region_name': 'foo_region_name', 86 'region_name': 'foo_region_name',
@@ -98,8 +92,6 @@ class CinderclientTestCase(test.TestCase):
98 92
99 cinder.AUTH_OBJ.get_client.assert_called_once_with( 93 cinder.AUTH_OBJ.get_client.assert_called_once_with(
100 fake_context, 94 fake_context,
101 insecure=data['cinder']['api_insecure'],
102 cacert=data['cinder']['ca_certificates_file'],
103 retries=data['cinder']['http_retries'], 95 retries=data['cinder']['http_retries'],
104 endpoint_type=data['cinder']['endpoint_type'], 96 endpoint_type=data['cinder']['endpoint_type'],
105 region_name=data['cinder']['region_name'], 97 region_name=data['cinder']['region_name'],
diff --git a/manila/volume/cinder.py b/manila/volume/cinder.py
index 747c67b..4424317 100644
--- a/manila/volume/cinder.py
+++ b/manila/volume/cinder.py
@@ -42,21 +42,11 @@ cinder_opts = [
42 deprecated_name="cinder_cross_az_attach", 42 deprecated_name="cinder_cross_az_attach",
43 help='Allow attaching between instances and volumes in ' 43 help='Allow attaching between instances and volumes in '
44 'different availability zones.'), 44 'different availability zones.'),
45 cfg.StrOpt('ca_certificates_file',
46 help='Location of CA certificates file to use for cinder '
47 'client requests.',
48 deprecated_group='DEFAULT',
49 deprecated_name="cinder_ca_certificates_file"),
50 cfg.IntOpt('http_retries', 45 cfg.IntOpt('http_retries',
51 default=3, 46 default=3,
52 help='Number of cinderclient retries on failed HTTP calls.', 47 help='Number of cinderclient retries on failed HTTP calls.',
53 deprecated_group='DEFAULT', 48 deprecated_group='DEFAULT',
54 deprecated_name="cinder_http_retries"), 49 deprecated_name="cinder_http_retries"),
55 cfg.BoolOpt('api_insecure',
56 default=False,
57 help='Allow to perform insecure SSL requests to cinder.',
58 deprecated_group='DEFAULT',
59 deprecated_name="cinder_api_insecure"),
60 cfg.StrOpt('endpoint_type', 50 cfg.StrOpt('endpoint_type',
61 default='publicURL', 51 default='publicURL',
62 help='Endpoint type to be used with cinder client calls.'), 52 help='Endpoint type to be used with cinder client calls.'),
@@ -64,10 +54,29 @@ cinder_opts = [
64 help='Region name for connecting to cinder.'), 54 help='Region name for connecting to cinder.'),
65 ] 55 ]
66 56
57# These fallback options can be removed in/after 9.0.0 (Train)
58deprecated_opts = {
59 'cafile': [
60 cfg.DeprecatedOpt('ca_certificates_file', group="DEFAULT"),
61 cfg.DeprecatedOpt('ca_certificates_file', group=CINDER_GROUP),
62 cfg.DeprecatedOpt('cinder_ca_certificates_file', group="DEFAULT"),
63 cfg.DeprecatedOpt('cinder_ca_certificates_file', group=CINDER_GROUP),
64 ],
65 'insecure': [
66 cfg.DeprecatedOpt('api_insecure', group="DEFAULT"),
67 cfg.DeprecatedOpt('api_insecure', group=CINDER_GROUP),
68 cfg.DeprecatedOpt('cinder_api_insecure', group="DEFAULT"),
69 cfg.DeprecatedOpt('cinder_api_insecure', group=CINDER_GROUP),
70 ],
71}
72
73
67CONF = cfg.CONF 74CONF = cfg.CONF
68CONF.register_opts(core_opts) 75CONF.register_opts(core_opts)
69CONF.register_opts(cinder_opts, CINDER_GROUP) 76CONF.register_opts(cinder_opts, CINDER_GROUP)
70ks_loading.register_session_conf_options(CONF, CINDER_GROUP) 77ks_loading.register_session_conf_options(CONF,
78 CINDER_GROUP,
79 deprecated_opts=deprecated_opts)
71ks_loading.register_auth_conf_options(CONF, CINDER_GROUP) 80ks_loading.register_auth_conf_options(CONF, CINDER_GROUP)
72 81
73 82
@@ -83,8 +92,6 @@ def cinderclient(context):
83 exception_module=cinder_exception, 92 exception_module=cinder_exception,
84 cfg_group=CINDER_GROUP) 93 cfg_group=CINDER_GROUP)
85 return AUTH_OBJ.get_client(context, 94 return AUTH_OBJ.get_client(context,
86 insecure=CONF[CINDER_GROUP].api_insecure,
87 cacert=CONF[CINDER_GROUP].ca_certificates_file,
88 retries=CONF[CINDER_GROUP].http_retries, 95 retries=CONF[CINDER_GROUP].http_retries,
89 endpoint_type=CONF[CINDER_GROUP].endpoint_type, 96 endpoint_type=CONF[CINDER_GROUP].endpoint_type,
90 region_name=CONF[CINDER_GROUP].region_name) 97 region_name=CONF[CINDER_GROUP].region_name)
diff --git a/releasenotes/notes/deprecate-old-ks-opts-in-nova-neutron-cinder-groups-e395015088d93fdc.yaml b/releasenotes/notes/deprecate-old-ks-opts-in-nova-neutron-cinder-groups-e395015088d93fdc.yaml
new file mode 100644
index 0000000..6c3ddfa
--- /dev/null
+++ b/releasenotes/notes/deprecate-old-ks-opts-in-nova-neutron-cinder-groups-e395015088d93fdc.yaml
@@ -0,0 +1,19 @@
1---
2fixes:
3 - |
4 `Launchpad bug 1809318 <https://bugs.launchpad.net/manila/+bug/1809318>`_
5 has been fixed. The deprecated options ``api_insecure`` and
6 ``ca_certificates_file`` from nova, cinder, neutron or DEFAULT
7 configuration groups no longer override the newer ``insecure`` option if
8 provided. Always use ``insecure`` and ``cafile`` to control SSL
9 and validation since the deprecated options will be removed in a future
10 release.
11deprecations:
12 - |
13 The options ``ca_certificates_file``, ``nova_ca_certificates_file``,
14 ``cinder_ca_certificates_file``, ``api_insecure``, ``nova_api_insecure``
15 and ``cinder_api_insecure`` have been deprecated from the ``DEFAULT``
16 group as well as ``nova``, ``neutron`` and ``cinder`` configuration
17 groups. Use ``cafile`` to specify the CA certificates and ``insecure``
18 to turn off SSL validation in these respective groups (nova, neutron and
19 cinder).