Remove parameters for native ssl support
These parameters were deprecated during the previous cycle by [1] and
have had no effect. These parameters are not really used by recent
glance.
[1] 2a2f349d8a
Depends-on: https://review.opendev.org/865924
Related-Bug: #1965776
Change-Id: Ia24b57966f6d8aee5cfa56cfe3496f1d81924ea1
This commit is contained in:
parent
ee6ef7d496
commit
493c828900
|
@ -268,18 +268,6 @@
|
||||||
# (optional) The amount of time in seconds to delay before performing a delete.
|
# (optional) The amount of time in seconds to delay before performing a delete.
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*cert_file*]
|
|
||||||
# (optional) Certificate file to use when starting API server securely
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*key_file*]
|
|
||||||
# (optional) Private key file to use when starting API server securely
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*ca_file*]
|
|
||||||
# (optional) CA certificate file to use to verify connecting clients
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*filesystem_store_metadata_file*]
|
# [*filesystem_store_metadata_file*]
|
||||||
# (optional) The path to a file which contains the metadata to be returned
|
# (optional) The path to a file which contains the metadata to be returned
|
||||||
# with any location associated with the filesystem store
|
# with any location associated with the filesystem store
|
||||||
|
@ -358,9 +346,6 @@ class glance::api(
|
||||||
$validate = undef,
|
$validate = undef,
|
||||||
$validation_options = undef,
|
$validation_options = undef,
|
||||||
$scrub_time = undef,
|
$scrub_time = undef,
|
||||||
$cert_file = undef,
|
|
||||||
$key_file = undef,
|
|
||||||
$ca_file = undef,
|
|
||||||
$filesystem_store_metadata_file = undef,
|
$filesystem_store_metadata_file = undef,
|
||||||
$filesystem_store_file_perm = undef,
|
$filesystem_store_file_perm = undef,
|
||||||
$pipeline = undef,
|
$pipeline = undef,
|
||||||
|
@ -386,12 +371,6 @@ class glance::api(
|
||||||
'DEFAULT/scrub_time': ensure => absent;
|
'DEFAULT/scrub_time': ensure => absent;
|
||||||
}
|
}
|
||||||
|
|
||||||
['cert_file', 'key_file', 'ca_file'].each |String $ssl_opt| {
|
|
||||||
if getvar($ssl_opt) != undef {
|
|
||||||
warning("The ${ssl_opt} parameter has been deprecated and has no effect.")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
['filesystem_store_metadata_file', 'filesystem_store_file_perm'].each |String $fs_opt| {
|
['filesystem_store_metadata_file', 'filesystem_store_file_perm'].each |String $fs_opt| {
|
||||||
if getvar($fs_opt) != undef {
|
if getvar($fs_opt) != undef {
|
||||||
warning("The ${fs_opt} parameter has been deprecated and will be removed.")
|
warning("The ${fs_opt} parameter has been deprecated and will be removed.")
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following parameters of the ``glance::api`` class have been removed.
|
||||||
|
|
||||||
|
- ``cert_file``
|
||||||
|
- ``key_file``
|
||||||
|
- ``ca_file``
|
Loading…
Reference in New Issue