Merge "Remove parameters for native ssl support"

changes/17/869617/1
Zuul 2 months ago committed by Gerrit Code Review
commit 8455905b3b

@ -268,18 +268,6 @@
# (optional) The amount of time in seconds to delay before performing a delete.
# 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*]
# (optional) The path to a file which contains the metadata to be returned
# with any location associated with the filesystem store
@ -358,9 +346,6 @@ class glance::api(
$validate = undef,
$validation_options = undef,
$scrub_time = undef,
$cert_file = undef,
$key_file = undef,
$ca_file = undef,
$filesystem_store_metadata_file = undef,
$filesystem_store_file_perm = undef,
$pipeline = undef,
@ -386,12 +371,6 @@ class glance::api(
'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| {
if getvar($fs_opt) != undef {
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…
Cancel
Save