From bbf9b5ac7ae3dc5ef5ce50a842a0578ed5e14a2f Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Thu, 12 Dec 2019 09:13:42 +0100 Subject: [PATCH] Properly set loopback_users via rabbitmq::loopback_users Sorta resurrecting https://review.opendev.org/#/c/324016/ now that https://github.com/voxpupuli/puppet-rabbitmq/pull/699 merged. This commit prevents a duplicate entry for loopback_users in the rabbitmq.config file: {loopback_users, [<<"guest">>]}, {loopback_users, []}, keeping only the expected empty array. Note: not a 100% clean cherry pick due to tht path changes. (cherry picked from commit 04a5937e1f1482dd3115ddc809c555abea87e69d) Change-Id: I0c291bf5611f02983c430179206556bae3b38736 --- puppet/services/rabbitmq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index 2ae9eb2d38..1c25be3e29 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -103,6 +103,7 @@ outputs: rabbitmq::delete_guest_user: false rabbitmq::wipe_db_on_cookie_change: true rabbitmq::port: 5672 + rabbitmq::loopback_users: [] rabbitmq::package_provider: yum rabbitmq::package_source: undef rabbitmq::repos_ensure: false @@ -121,7 +122,6 @@ outputs: rabbitmq_config_variables: cluster_partition_handling: 'ignore' queue_master_locator: '<<"min-masters">>' - loopback_users: '[]' rabbitmq::erlang_cookie: yaql: expression: $.data.passwords.where($ != '').first()