Deprecate allow_insecure_clients option
The allow_insecure_clients has been deprecated[1]. [1]https://review.opendev.org/#/c/417629/ Change-Id: I1130125fb877146ea8b0c531f1ef5854aa211c33 Closes-Bug: #1902158
This commit is contained in:
parent
170684de1b
commit
9f2e3882d5
@ -146,10 +146,6 @@
|
|||||||
# (Optional) Password for decrypting ssl_key_file (if encrypted)
|
# (Optional) Password for decrypting ssl_key_file (if encrypted)
|
||||||
# Defaults to $::os_service_default.
|
# 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*]
|
# [*amqp_sasl_mechanisms*]
|
||||||
# (Optional) Space separated list of acceptable SASL mechanisms
|
# (Optional) Space separated list of acceptable SASL mechanisms
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
@ -427,6 +423,10 @@
|
|||||||
# (optional) If set, use this value for max_overflow with sqlalchemy.
|
# (optional) If set, use this value for max_overflow with sqlalchemy.
|
||||||
# Defaults to: undef.
|
# Defaults to: undef.
|
||||||
#
|
#
|
||||||
|
# [*amqp_allow_insecure_clients*]
|
||||||
|
# (Optional) Accept clients using either SSL or plain TCP
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
class nova(
|
class nova(
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
$block_device_allocate_retries = $::os_service_default,
|
$block_device_allocate_retries = $::os_service_default,
|
||||||
@ -459,7 +459,6 @@ class nova(
|
|||||||
$amqp_ssl_cert_file = $::os_service_default,
|
$amqp_ssl_cert_file = $::os_service_default,
|
||||||
$amqp_ssl_key_file = $::os_service_default,
|
$amqp_ssl_key_file = $::os_service_default,
|
||||||
$amqp_ssl_key_password = $::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_mechanisms = $::os_service_default,
|
||||||
$amqp_sasl_config_dir = $::os_service_default,
|
$amqp_sasl_config_dir = $::os_service_default,
|
||||||
$amqp_sasl_config_name = $::os_service_default,
|
$amqp_sasl_config_name = $::os_service_default,
|
||||||
@ -519,6 +518,7 @@ class nova(
|
|||||||
$database_max_retries = undef,
|
$database_max_retries = undef,
|
||||||
$database_retry_interval = undef,
|
$database_retry_interval = undef,
|
||||||
$database_max_overflow = undef,
|
$database_max_overflow = undef,
|
||||||
|
$amqp_allow_insecure_clients = undef,
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@ -532,6 +532,11 @@ class nova(
|
|||||||
warning('enabled_ssl_apis is empty but use_ssl is set to true')
|
warning('enabled_ssl_apis is empty but use_ssl is set to true')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $amqp_allow_insecure_clients != undef {
|
||||||
|
warning('The amqp_allow_insecure_clients parameter is deprecated and \
|
||||||
|
will be removed in a future release.')
|
||||||
|
}
|
||||||
|
|
||||||
if $os_region_name != undef {
|
if $os_region_name != undef {
|
||||||
warning('The os_region_name parameter is deprecated and will be removed \
|
warning('The os_region_name parameter is deprecated and will be removed \
|
||||||
in a future release. Use nova::cinder::os_region_name instead')
|
in a future release. Use nova::cinder::os_region_name instead')
|
||||||
@ -719,22 +724,21 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
|
|||||||
}
|
}
|
||||||
|
|
||||||
oslo::messaging::amqp { 'nova_config':
|
oslo::messaging::amqp { 'nova_config':
|
||||||
server_request_prefix => $amqp_server_request_prefix,
|
server_request_prefix => $amqp_server_request_prefix,
|
||||||
broadcast_prefix => $amqp_broadcast_prefix,
|
broadcast_prefix => $amqp_broadcast_prefix,
|
||||||
group_request_prefix => $amqp_group_request_prefix,
|
group_request_prefix => $amqp_group_request_prefix,
|
||||||
container_name => $amqp_container_name,
|
container_name => $amqp_container_name,
|
||||||
idle_timeout => $amqp_idle_timeout,
|
idle_timeout => $amqp_idle_timeout,
|
||||||
trace => $amqp_trace,
|
trace => $amqp_trace,
|
||||||
ssl_ca_file => $amqp_ssl_ca_file,
|
ssl_ca_file => $amqp_ssl_ca_file,
|
||||||
ssl_cert_file => $amqp_ssl_cert_file,
|
ssl_cert_file => $amqp_ssl_cert_file,
|
||||||
ssl_key_file => $amqp_ssl_key_file,
|
ssl_key_file => $amqp_ssl_key_file,
|
||||||
ssl_key_password => $amqp_ssl_key_password,
|
ssl_key_password => $amqp_ssl_key_password,
|
||||||
allow_insecure_clients => $amqp_allow_insecure_clients,
|
sasl_mechanisms => $amqp_sasl_mechanisms,
|
||||||
sasl_mechanisms => $amqp_sasl_mechanisms,
|
sasl_config_dir => $amqp_sasl_config_dir,
|
||||||
sasl_config_dir => $amqp_sasl_config_dir,
|
sasl_config_name => $amqp_sasl_config_name,
|
||||||
sasl_config_name => $amqp_sasl_config_name,
|
username => $amqp_username,
|
||||||
username => $amqp_username,
|
password => $amqp_password,
|
||||||
password => $amqp_password,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# SSL Options
|
# SSL Options
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- allow_insecure_clients option is now deprecated for removal, the
|
||||||
|
parameter has no effect.
|
@ -307,7 +307,6 @@ describe 'nova' do
|
|||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_cert_file').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_cert_file').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_key_file').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_key_file').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_key_password').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/ssl_key_password').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/allow_insecure_clients').with_value('<SERVICE DEFAULT>')
|
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_mechanisms').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_mechanisms').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_config_dir').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_config_dir').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_config_name').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('oslo_messaging_amqp/sasl_config_name').with_value('<SERVICE DEFAULT>')
|
||||||
|
Loading…
Reference in New Issue
Block a user