Deprecate allow_insecure_clients option
The allow_insecure_clients has been deprecated[1]. [1]https://review.opendev.org/#/c/417629/ Change-Id: I80871a667739817f8784361da3165f71b2b3d742 Closes-Bug: #1902158
This commit is contained in:
parent
3e36643308
commit
d22aa9dcda
|
@ -124,10 +124,6 @@
|
|||
# (Optional) Password for decrypting ssl_key_file (if encrypted)
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*amqp_allow_insecure_clients*]
|
||||
# (Optional) Accept clients using either SSL or plain TCP
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*amqp_sasl_mechanisms*]
|
||||
# (Optional) Space separated list of acceptable SASL mechanisms
|
||||
# Defaults to $::os_service_default.
|
||||
|
@ -263,6 +259,10 @@
|
|||
# Defaults to $::os_service_default.
|
||||
# Deprecated, use fetcher_backend instead
|
||||
#
|
||||
# [*amqp_allow_insecure_clients*]
|
||||
# (Optional) Accept clients using either SSL or plain TCP
|
||||
# Defaults to undef.
|
||||
#
|
||||
class cloudkitty(
|
||||
$package_ensure = 'present',
|
||||
$rabbit_use_ssl = $::os_service_default,
|
||||
|
@ -288,7 +288,6 @@ class cloudkitty(
|
|||
$amqp_ssl_cert_file = $::os_service_default,
|
||||
$amqp_ssl_key_file = $::os_service_default,
|
||||
$amqp_ssl_key_password = $::os_service_default,
|
||||
$amqp_allow_insecure_clients = $::os_service_default,
|
||||
$amqp_sasl_mechanisms = $::os_service_default,
|
||||
$amqp_sasl_config_dir = $::os_service_default,
|
||||
$amqp_sasl_config_name = $::os_service_default,
|
||||
|
@ -317,12 +316,18 @@ class cloudkitty(
|
|||
Optional[Hash] $metrics_config = undef,
|
||||
# DEPRECATED PARAMETERS
|
||||
$tenant_fetcher_backend = undef,
|
||||
$amqp_allow_insecure_clients = undef,
|
||||
) {
|
||||
|
||||
if $tenant_fetcher_backend != undef {
|
||||
warning('The parameter cloudkitty::tenant_fetcher_backend was deprecated and has no effect. Use fetcher_backend instead.')
|
||||
}
|
||||
|
||||
if $amqp_allow_insecure_clients != undef {
|
||||
warning('The amqp_allow_insecure_clients parameter is deprecated and \
|
||||
will be removed in a future release.')
|
||||
}
|
||||
|
||||
include cloudkitty::params
|
||||
include cloudkitty::db
|
||||
include cloudkitty::deps
|
||||
|
@ -365,7 +370,6 @@ class cloudkitty(
|
|||
ssl_cert_file => $amqp_ssl_cert_file,
|
||||
ssl_key_file => $amqp_ssl_key_file,
|
||||
ssl_key_password => $amqp_ssl_key_password,
|
||||
allow_insecure_clients => $amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $amqp_sasl_config_dir,
|
||||
sasl_config_name => $amqp_sasl_config_name,
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
deprecations:
|
||||
- allow_insecure_clients option is now deprecated for removal, the
|
||||
parameter has no effect.
|
|
@ -165,7 +165,6 @@ describe 'cloudkitty' do
|
|||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/ssl_cert_file').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/ssl_key_file').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/ssl_key_password').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/allow_insecure_clients').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/sasl_mechanisms').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/sasl_config_dir').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cloudkitty_config('oslo_messaging_amqp/sasl_config_name').with_value('<SERVICE DEFAULT>')
|
||||
|
|
Loading…
Reference in New Issue