diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp index 5857fb54c..07c99680e 100644 --- a/manifests/messaging/amqp.pp +++ b/manifests/messaging/amqp.pp @@ -32,12 +32,6 @@ # (Optional) Space separated list of acceptable SASL mechanisms # Defaults to $::os_service_default. # -# DEPRECATED PARAMETERS -# -# [*amqp_allow_insecure_clients*] -# (Optional) Accept clients using either SSL or plain TCP -# Defaults to undef. -# class keystone::messaging::amqp( $amqp_pre_settled = $::os_service_default, $amqp_idle_timeout = $::os_service_default, @@ -46,17 +40,10 @@ class keystone::messaging::amqp( $amqp_ssl_key_file = $::os_service_default, $amqp_ssl_key_password = $::os_service_default, $amqp_sasl_mechanisms = $::os_service_default, - # DEPRECATED PARAMETERS - $amqp_allow_insecure_clients = undef, ) { include keystone::deps - if $amqp_allow_insecure_clients != undef { - warning('The amqp_allow_insecure_clients parameter is deprecated and \ -will be removed in a future release.') - } - oslo::messaging::amqp { 'keystone_config': pre_settled => $amqp_pre_settled, idle_timeout => $amqp_idle_timeout, diff --git a/releasenotes/notes/remove-amqp_allow_insecure_clients-00d7bc282aedc638.yaml b/releasenotes/notes/remove-amqp_allow_insecure_clients-00d7bc282aedc638.yaml new file mode 100644 index 000000000..3e8c1663d --- /dev/null +++ b/releasenotes/notes/remove-amqp_allow_insecure_clients-00d7bc282aedc638.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``keystone::messaging::amqp::allow_insecure_clients`` parameter has + been removed.