diff --git a/rabbitmq/config/bindings/clean.sls b/rabbitmq/config/bindings/clean.sls index 3a2f750c..203c3f35 100644 --- a/rabbitmq/config/bindings/clean.sls +++ b/rabbitmq/config/bindings/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'bindings' in node and node.bindings is mapping %} {%- for binding, q in node.bindings.items() %} diff --git a/rabbitmq/config/bindings/install.sls b/rabbitmq/config/bindings/install.sls index 9db05964..df692184 100644 --- a/rabbitmq/config/bindings/install.sls +++ b/rabbitmq/config/bindings/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'bindings' in node and node.bindings is mapping %} {%- for binding, ex in node.bindings.items() %} diff --git a/rabbitmq/config/clusters/clean.sls b/rabbitmq/config/clusters/clean.sls index 75dd1857..b9805c8e 100644 --- a/rabbitmq/config/clusters/clean.sls +++ b/rabbitmq/config/clusters/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'clustered' in node and node.clustered and 'join_node' in node %} rabbitmq-config-clusters-{{ name }}-leave-{{ node.join_node }}: diff --git a/rabbitmq/config/clusters/install.sls b/rabbitmq/config/clusters/install.sls index 5e985aac..0586262d 100644 --- a/rabbitmq/config/clusters/install.sls +++ b/rabbitmq/config/clusters/install.sls @@ -12,7 +12,7 @@ include: - {{ sls_config_users }} - {{ sls_config_files }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'clustered' in node and node.clustered and 'join_node' in node %} {%- if 'erlang_cookie' in node and node.erlang_cookie %} diff --git a/rabbitmq/config/exchanges/clean.sls b/rabbitmq/config/exchanges/clean.sls index 31cce6f3..faa0a005 100644 --- a/rabbitmq/config/exchanges/clean.sls +++ b/rabbitmq/config/exchanges/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'exchanges' in node and node.exchanges is mapping %} {%- for exchange, q in node.exchanges.items() %} diff --git a/rabbitmq/config/exchanges/install.sls b/rabbitmq/config/exchanges/install.sls index 48e47a74..b22a0160 100644 --- a/rabbitmq/config/exchanges/install.sls +++ b/rabbitmq/config/exchanges/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'exchanges' in node and node.exchanges is mapping %} {%- for exchange, ex in node.exchanges.items() %} diff --git a/rabbitmq/config/files/clean.sls b/rabbitmq/config/files/clean.sls index 0392ab70..34df958c 100644 --- a/rabbitmq/config/files/clean.sls +++ b/rabbitmq/config/files/clean.sls @@ -8,7 +8,7 @@ include: - {{ sls_package_clean }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} rabbitmq-config-files-absent-{{ name }}: file.absent: diff --git a/rabbitmq/config/files/install.sls b/rabbitmq/config/files/install.sls index 37c91a00..78674048 100644 --- a/rabbitmq/config/files/install.sls +++ b/rabbitmq/config/files/install.sls @@ -9,7 +9,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'config' in node and node.config is mapping %} rabbitmq-config-files-managed-{{ name }}: diff --git a/rabbitmq/config/params/install.sls b/rabbitmq/config/params/install.sls index 85e1386e..d2645e2d 100644 --- a/rabbitmq/config/params/install.sls +++ b/rabbitmq/config/params/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'params' in node and node.params is mapping %} {%- for param, items in node.params.items() %} diff --git a/rabbitmq/config/plugins/clean.sls b/rabbitmq/config/plugins/clean.sls index ea2f8e1c..5135787c 100644 --- a/rabbitmq/config/plugins/clean.sls +++ b/rabbitmq/config/plugins/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'plugins' in node and node.plugins is iterable and node.plugins is not string %} {%- for plugin in node.plugins %} diff --git a/rabbitmq/config/plugins/install.sls b/rabbitmq/config/plugins/install.sls index 7ef3df84..c0359474 100644 --- a/rabbitmq/config/plugins/install.sls +++ b/rabbitmq/config/plugins/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'plugins' in node and node.plugins is iterable and node.plugins is not string %} {%- for plugin in node.plugins %} diff --git a/rabbitmq/config/policies/clean.sls b/rabbitmq/config/policies/clean.sls index 5c69d6c1..7992c011 100644 --- a/rabbitmq/config/policies/clean.sls +++ b/rabbitmq/config/policies/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'policies' in node and node.policies is mapping %} {%- for policy, items in node.policies.items() %} diff --git a/rabbitmq/config/policies/install.sls b/rabbitmq/config/policies/install.sls index d2c3911d..0c51e285 100644 --- a/rabbitmq/config/policies/install.sls +++ b/rabbitmq/config/policies/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'policies' in node and node.policies is mapping %} {%- for policy, items in node.policies.items() %} diff --git a/rabbitmq/config/queues/clean.sls b/rabbitmq/config/queues/clean.sls index e3a59dcd..27904796 100644 --- a/rabbitmq/config/queues/clean.sls +++ b/rabbitmq/config/queues/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'queues' in node and node.queues is mapping %} {%- for queue, q in node.queues.items() %} diff --git a/rabbitmq/config/queues/install.sls b/rabbitmq/config/queues/install.sls index 07909495..22fa9e2c 100644 --- a/rabbitmq/config/queues/install.sls +++ b/rabbitmq/config/queues/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'queues' in node and node.queues is mapping %} {%- for queue, q in node.queues.items() %} diff --git a/rabbitmq/config/upstreams/clean.sls b/rabbitmq/config/upstreams/clean.sls index 1d2a98bc..6dc04045 100644 --- a/rabbitmq/config/upstreams/clean.sls +++ b/rabbitmq/config/upstreams/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'upstreams' in node and node.upstreams is mapping %} {%- for upstream, items in node.upstreams.items() %} diff --git a/rabbitmq/config/upstreams/install.sls b/rabbitmq/config/upstreams/install.sls index 4e00d4fe..1f218804 100644 --- a/rabbitmq/config/upstreams/install.sls +++ b/rabbitmq/config/upstreams/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'upstreams' in node and node.upstreams is mapping %} {%- for upstream, items in node.upstreams.items() %} diff --git a/rabbitmq/config/users/clean.sls b/rabbitmq/config/users/clean.sls index 37c3429c..fae145f6 100644 --- a/rabbitmq/config/users/clean.sls +++ b/rabbitmq/config/users/clean.sls @@ -13,7 +13,7 @@ rabbitmq-config-users-environ-locale: - update_minion: True {%- endif %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'users' in node and node.users is mapping %} {%- for user, items in node.users.items() %} diff --git a/rabbitmq/config/users/install.sls b/rabbitmq/config/users/install.sls index ff9a917c..1c46b45d 100644 --- a/rabbitmq/config/users/install.sls +++ b/rabbitmq/config/users/install.sls @@ -11,7 +11,7 @@ include: - {{ sls_service_running }} - {{ sls_vhosts_install }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'users' in node and node.users is mapping %} {%- for user, u in node.users.items() %} diff --git a/rabbitmq/config/vhosts/clean.sls b/rabbitmq/config/vhosts/clean.sls index 93775d91..ac05264a 100644 --- a/rabbitmq/config/vhosts/clean.sls +++ b/rabbitmq/config/vhosts/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'vhosts' in node and node.vhosts is iterable and node.vhosts is not string %} {%- for vhost in node.vhosts %} diff --git a/rabbitmq/config/vhosts/install.sls b/rabbitmq/config/vhosts/install.sls index 032b7f76..8c00f7a9 100644 --- a/rabbitmq/config/vhosts/install.sls +++ b/rabbitmq/config/vhosts/install.sls @@ -8,7 +8,7 @@ include: - {{ sls_service_running }} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'vhosts' in node and node.vhosts is iterable and node.vhosts is not string %} {%- for vhost in node.vhosts %} diff --git a/rabbitmq/service/clean.sls b/rabbitmq/service/clean.sls index 7783d8c8..f40d14fb 100644 --- a/rabbitmq/service/clean.sls +++ b/rabbitmq/service/clean.sls @@ -4,7 +4,7 @@ {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'service' in node and node.service %} {%- set svcname = 'rabbitmq-server' %} {%- if name != 'rabbit' %} diff --git a/rabbitmq/service/running.sls b/rabbitmq/service/running.sls index 65fa98f7..4cecdcf2 100644 --- a/rabbitmq/service/running.sls +++ b/rabbitmq/service/running.sls @@ -11,7 +11,7 @@ include: - {{ sls_config_files }} - {{ sls_config_users }} - {%- for name, node in salt["config.get"]("rabbitmq:nodes", {}).items() %} + {%- for name, node in rabbitmq.nodes.items() %} {%- if 'service' in node and node.service %} {%- set svcname = 'rabbitmq-server' %} {%- if name != 'rabbit' %} diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index d5c653ec..8f9e0b99 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -87,7 +87,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index a089b11f..6147422d 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -87,7 +87,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index b0956eb9..5960c2c1 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 97a7d96b..d2625aab 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -83,7 +83,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 4f294519..2efdeac1 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 3d26aea9..bbdd15f3 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -87,7 +87,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 45331a2d..928a95e3 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -87,7 +87,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index facf12ff..00671191 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -87,7 +87,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index bdfb0ebe..341fb5e5 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 904f15c4..33281e78 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index e51aa306..191eb1e3 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 1841349e..711a5da9 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 41ebd0f9..f3428e5e 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -85,7 +85,6 @@ values: vhost: default_vhost queues: {} remove_guest_user: true - runas: rabbitmq service: true upstream: my-new-upstream1: diff --git a/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml b/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml b/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/centos-7.yaml b/test/integration/nopillars/files/_mapdata/centos-7.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/centos-7.yaml +++ b/test/integration/nopillars/files/_mapdata/centos-7.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/centos-8.yaml b/test/integration/nopillars/files/_mapdata/centos-8.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/centos-8.yaml +++ b/test/integration/nopillars/files/_mapdata/centos-8.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/debian-10.yaml b/test/integration/nopillars/files/_mapdata/debian-10.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/debian-10.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-10.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/debian-11.yaml b/test/integration/nopillars/files/_mapdata/debian-11.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/debian-11.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-11.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/debian-9.yaml b/test/integration/nopillars/files/_mapdata/debian-9.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/debian-9.yaml +++ b/test/integration/nopillars/files/_mapdata/debian-9.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/fedora-32.yaml b/test/integration/nopillars/files/_mapdata/fedora-32.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/fedora-32.yaml +++ b/test/integration/nopillars/files/_mapdata/fedora-32.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/fedora-33.yaml b/test/integration/nopillars/files/_mapdata/fedora-33.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/fedora-33.yaml +++ b/test/integration/nopillars/files/_mapdata/fedora-33.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/fedora-34.yaml b/test/integration/nopillars/files/_mapdata/fedora-34.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/fedora-34.yaml +++ b/test/integration/nopillars/files/_mapdata/fedora-34.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/nopillars/files/_mapdata/gentoo-2-sysd.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/nopillars/files/_mapdata/gentoo-2-sysd.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/nopillars/files/_mapdata/gentoo-2-sysv.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/nopillars/files/_mapdata/gentoo-2-sysv.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/opensuse-15.yaml b/test/integration/nopillars/files/_mapdata/opensuse-15.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/opensuse-15.yaml +++ b/test/integration/nopillars/files/_mapdata/opensuse-15.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/nopillars/files/_mapdata/opensuse-tumbleweed.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/nopillars/files/_mapdata/opensuse-tumbleweed.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml b/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/nopillars/files/_mapdata/oraclelinux-7.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml b/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/nopillars/files/_mapdata/oraclelinux-8.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-16.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-18.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: diff --git a/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml b/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml index dd4a759a..7673bd74 100644 --- a/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/nopillars/files/_mapdata/ubuntu-20.yaml @@ -27,7 +27,9 @@ values: rabbit: clustered: false config: {} - erlang_cookie: '' + distport: 25672 + erlang_cookie: shared-secret + nodeport: 5672 plugins: - rabbitmq_management - rabbitmq_federation @@ -39,7 +41,6 @@ values: - definition: '{"ha-mode": "all"}' queues: {} remove_guest_user: true - runas: rabbitmq service: true users: {} vhosts: