From f090d31a9136a5217b191fc78dff09e36528b017 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Fri, 30 Jul 2021 00:25:25 +0100 Subject: [PATCH] fix(config): fix various configuration issues --- pillar.example | 24 ++--- rabbitmq/config/bindings/clean.sls | 6 +- rabbitmq/config/bindings/install.sls | 9 +- rabbitmq/config/exchanges/clean.sls | 8 +- rabbitmq/config/exchanges/install.sls | 15 ++-- rabbitmq/config/plugins/clean.sls | 17 +++- rabbitmq/config/plugins/install.sls | 9 +- rabbitmq/config/policies/clean.sls | 26 +----- rabbitmq/config/queues/clean.sls | 6 +- rabbitmq/config/queues/install.sls | 9 +- rabbitmq/config/upstreams/clean.sls | 22 +---- rabbitmq/config/users/clean.sls | 6 ++ rabbitmq/config/users/install.sls | 1 - rabbitmq/config/vhosts/clean.sls | 3 - rabbitmq/config/vhosts/install.sls | 3 - rabbitmq/service/running.sls | 3 +- .../default/files/_mapdata/centos-7.yaml | 86 +++++++++--------- .../default/files/_mapdata/centos-8.yaml | 86 +++++++++--------- .../default/files/_mapdata/debian-10.yaml | 88 +++++++++--------- .../default/files/_mapdata/debian-11.yaml | 90 +++++++++---------- .../default/files/_mapdata/debian-9.yaml | 86 +++++++++--------- .../default/files/_mapdata/fedora-32.yaml | 86 +++++++++--------- .../default/files/_mapdata/fedora-33.yaml | 86 +++++++++--------- .../default/files/_mapdata/fedora-34.yaml | 86 +++++++++--------- .../default/files/_mapdata/opensuse-15.yaml | 86 +++++++++--------- .../files/_mapdata/opensuse-tumbleweed.yaml | 86 +++++++++--------- .../default/files/_mapdata/ubuntu-16.yaml | 86 +++++++++--------- .../default/files/_mapdata/ubuntu-18.yaml | 87 +++++++++--------- .../default/files/_mapdata/ubuntu-20.yaml | 87 +++++++++--------- .../nopillars/files/_mapdata/centos-7.yaml | 6 +- 30 files changed, 619 insertions(+), 680 deletions(-) diff --git a/pillar.example b/pillar.example index dd2c5d55..c4873c01 100644 --- a/pillar.example +++ b/pillar.example @@ -30,8 +30,8 @@ rabbitmq: ## note : dict format user: saltstack_mq passwd: password - durable: true - auto_delete: false + durable: 'true' + auto_delete: 'false' vhost: default_vhost arguments: - x-message-ttl: 8640000 @@ -39,7 +39,7 @@ rabbitmq: - x-dead-letter-exchange: my-exchange bindings: my-binding: - source: 'customers.direct' + source: 'amq.topic' destination_type: queue destination: my-queue routing_key: a_routing_key_string @@ -51,9 +51,9 @@ rabbitmq: user: saltstack_mq passwd: 'password' type: fanout - durable: true - internal: false - auto_delete: false + durable: 'true' + internal: 'false' + auto_delete: 'false' vhost: default_vhost arguments: - 'alternate-**exchange': 'amq.fanout' @@ -135,8 +135,8 @@ rabbitmq: ## note : dict format user: saltstack_mq passwd: password - durable: true - auto_delete: false + durable: 'true' + auto_delete: 'false' vhost: rabbit2_vhost arguments: - x-message-ttl: 8640000 @@ -144,7 +144,7 @@ rabbitmq: - x-dead-letter-exchange: my-exchange bindings: my-binding: - source: 'customers.direct' + source: 'amq.topic' destination_type: queue destination: my-queue routing_key: a_routing_key_string @@ -156,9 +156,9 @@ rabbitmq: user: saltstack_mq passwd: 'password' type: fanout - durable: true - internal: false - auto_delete: false + durable: 'true' + internal: 'false' + auto_delete: 'false' vhost: rabbit2_vhost arguments: - 'alternate-**exchange': 'amq.fanout' diff --git a/rabbitmq/config/bindings/clean.sls b/rabbitmq/config/bindings/clean.sls index 9ac87aa0..60a07178 100644 --- a/rabbitmq/config/bindings/clean.sls +++ b/rabbitmq/config/bindings/clean.sls @@ -3,13 +3,11 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_clean = tplroot ~ '.service.clean' %} {%- set sls_config_users_clean = tplroot ~ '.config.users.clean' %} {%- set sls_config_vhosts_clean = tplroot ~ '.config.vhosts.clean' %} {%- set sls_config_plugins_clean = tplroot ~ '.config.plugins.clean' %} include: - - {{ sls_service_clean }} - {{ sls_config_plugins_clean }} - {{ sls_config_users_clean }} - {{ sls_config_vhosts_clean }} @@ -20,13 +18,13 @@ include: rabbitmq-config-bindings-delete-{{ name }}-{{ binding }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} delete binding --vhost={{ b.vhost }} --username={{ b.user }} --password={{ b.passwd }} source={{ b.source }} destination={{ b.destination }} destination_type={{ b.destination_type }} || true # noqa 204 + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} delete binding --vhost={{ b.vhost }} --username={{ b.user }} --password={{ b.passwd }} source={{ b.source }} destination={{ b.destination }} destination_type={{ b.destination_type }} || true # noqa 204 - onlyif: - test -x /usr/local/sbin/rabbitmqadmin - test -d {{ rabbitmq.dir.data }} + # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require_in: - - sls: {{ sls_service_clean }} - sls: {{ sls_config_plugins_clean }} - sls: {{ sls_config_users_clean }} - sls: {{ sls_config_vhosts_clean }} diff --git a/rabbitmq/config/bindings/install.sls b/rabbitmq/config/bindings/install.sls index f9d678e4..18afbea7 100644 --- a/rabbitmq/config/bindings/install.sls +++ b/rabbitmq/config/bindings/install.sls @@ -3,13 +3,11 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_running = tplroot ~ '.service.running' %} {%- set sls_config_plugins = tplroot ~ '.config.plugins.install' %} {%- set sls_config_users = tplroot ~ '.config.users.install' %} {%- set sls_config_vhosts = tplroot ~ '.config.vhosts.install' %} include: - - {{ sls_service_running }} - {{ sls_config_plugins }} - {{ sls_config_users }} - {{ sls_config_vhosts }} @@ -20,11 +18,12 @@ include: rabbitmq-config-bindings-enabled-{{ name }}-{{ binding }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} declare binding --vhost={{ b.vhost }} --username={{ b.user }} --password={{ b.passwd }} source={{ b.source }} destination={{ b.destination }} destination_type={{ b.destination_type }} routing_key={{ b.routing_key }} # noqa 204 - - onlyif: test -x /usr/sbin/rabbitmqctl + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare binding --vhost={{ b.vhost }} --username={{ b.user }} --password={{ b.passwd }} source={{ b.source }} destination={{ b.destination }} destination_type={{ b.destination_type }} routing_key={{ b.routing_key }} # noqa 204 + - onlyif: + - test -x /usr/local/sbin/rabbitmqadmin + - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require: - - service: rabbitmq-service-running-service-running-{{ name }} - sls: {{ sls_config_plugins }} - sls: {{ sls_config_users }} - sls: {{ sls_config_vhosts }} diff --git a/rabbitmq/config/exchanges/clean.sls b/rabbitmq/config/exchanges/clean.sls index 14acc2c1..6f10378e 100644 --- a/rabbitmq/config/exchanges/clean.sls +++ b/rabbitmq/config/exchanges/clean.sls @@ -3,13 +3,11 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_clean = tplroot ~ '.service.clean' %} {%- set sls_config_users_clean = tplroot ~ '.config.users.clean' %} {%- set sls_config_vhosts_clean = tplroot ~ '.config.vhosts.clean' %} {%- set sls_config_plugins_clean = tplroot ~ '.config.plugins.clean' %} include: - - {{ sls_service_clean }} - {{ sls_config_plugins_clean }} - {{ sls_config_users_clean }} - {{ sls_config_vhosts_clean }} @@ -20,16 +18,16 @@ include: rabbitmq-config-exchanges-delete-{{ name }}-{{ exchange }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} delete exchange --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ exchange }} || true # noqa 204 + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} delete exchange --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ exchange }} || true # noqa 204 - onlyif: - test -x /usr/local/sbin/rabbitmqadmin - test -d {{ rabbitmq.dir.data }} + - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require_in: - - {{ sls_service_clean }} - - {{ sls_config_plugins_clean }} - {{ sls_config_users_clean }} - {{ sls_config_vhosts_clean }} + - {{ sls_config_plugins_clean }} {%- endfor %} {%- endif %} diff --git a/rabbitmq/config/exchanges/install.sls b/rabbitmq/config/exchanges/install.sls index aa83add6..4b9f67f0 100644 --- a/rabbitmq/config/exchanges/install.sls +++ b/rabbitmq/config/exchanges/install.sls @@ -3,12 +3,14 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_running = tplroot ~ '.service.running' %} {%- set sls_config_plugins = tplroot ~ '.config.plugins.install' %} +{%- set sls_config_users = tplroot ~ '.config.users.install' %} +{%- set sls_config_vhosts = tplroot ~ '.config.vhosts.install' %} include: - - {{ sls_service_running }} - {{ sls_config_plugins }} + - {{ sls_config_users }} + - {{ sls_config_vhosts }} {%- for name, node in rabbitmq.nodes.items() %} {%- if 'exchanges' in node and node.exchanges is mapping %} @@ -16,12 +18,15 @@ include: rabbitmq-config-exchanges-enabled-{{ name }}-{{ exchange }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} declare exchange --vhost={{ ex.vhost }} --username={{ ex.user }} --password={{ ex.passwd }} name={{ exchange }} type={{ ex.type }} durable={{ ex.durable }} internal={{ ex.internal }} auto_delete={{ ex.auto_delete }} # noqa 204 - - onlyif: test -x /usr/sbin/rabbitmqctl + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare exchange --vhost={{ ex.vhost }} --username={{ ex.user }} --password={{ ex.passwd }} name={{ exchange }} type={{ ex.type }} durable={{ ex.durable }} internal={{ ex.internal }} auto_delete={{ ex.auto_delete }} # noqa 204 + - onlyif: + - test -x /usr/local/sbin/rabbitmqadmin + - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require: - - service: rabbitmq-service-running-service-running-{{ name }} - sls: {{ sls_config_plugins }} + - sls: {{ sls_config_users }} + - sls: {{ sls_config_vhosts }} {%- endfor %} {%- endif %} diff --git a/rabbitmq/config/plugins/clean.sls b/rabbitmq/config/plugins/clean.sls index 03ba280a..9228c69f 100644 --- a/rabbitmq/config/plugins/clean.sls +++ b/rabbitmq/config/plugins/clean.sls @@ -3,6 +3,10 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} +{%- set sls_service_clean = tplroot ~ '.service.clean' %} + +include: + - {{ sls_service_clean }} {%- for name, node in rabbitmq.nodes.items() %} {%- if 'plugins' in node and node.plugins is iterable and node.plugins is not string %} @@ -12,13 +16,20 @@ rabbitmq-config-plugins-disabled-{{ name }}-{{ plugin }}: cmd.run: - name: /usr/sbin/rabbitmq-plugins --node {{ name }} disable {{ plugin }} - onlyif: - - test -x /usr/sbin/rabbitmq-plugins - test -d {{ rabbitmq.dir.data }} - test -f {{ rabbitmq.dir.config }}/enabled_plugins + - /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled {{ plugin }} - runas: root - file.absent: - - name: /usr/local/sbin/rabbitmqadmin + - require_in: + - file: rabbitmq-config-plugins-disabled-{{ name }}-{{ plugin }} + - file: rabbitmq-config-plugins-clean-rabbitmqadmin {%- endfor %} {%- endif %} {%- endfor %} + +rabbitmq-config-plugins-clean-rabbitmqadmin: + file.absent: + - name: /usr/local/sbin/rabbitmqadmin + - require_in: + - sls: {{ sls_service_clean }} diff --git a/rabbitmq/config/plugins/install.sls b/rabbitmq/config/plugins/install.sls index 1f00916c..e5cd14aa 100644 --- a/rabbitmq/config/plugins/install.sls +++ b/rabbitmq/config/plugins/install.sls @@ -14,9 +14,11 @@ include: rabbitmq-config-plugins-enabled-{{ name }}-{{ plugin }}: cmd.run: - - name: /usr/sbin/rabbitmq-plugins --node {{ name }} enable {{ plugin }} + - name: /usr/sbin/rabbitmq-plugins --node {{ name }} enable {{ plugin }} || true - runas: root - - onlyif: test -x /usr/sbin/rabbitmqctl + - unless: /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled {{ plugin }} + - onchanges_in: + - cmd: rabbitmq-service-running-daemon-reload - watch_in: - service: rabbitmq-service-running-service-running-{{ name }} @@ -26,6 +28,9 @@ rabbitmq-config-plugins-{{ name }}-rabbitmqadmin-install: cmd.run: - name : curl -k -L http://localhost:15672/cli/rabbitmqadmin -o /usr/local/sbin/rabbitmqadmin - unless: test -x /usr/local/bin/rabbitmqadmin + - onlyif: /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled {{ plugin }} + - require: + - sls: {{ sls_service_running }} file.managed: - name: /usr/local/sbin/rabbitmqadmin - user: root diff --git a/rabbitmq/config/policies/clean.sls b/rabbitmq/config/policies/clean.sls index addbf592..e426215c 100644 --- a/rabbitmq/config/policies/clean.sls +++ b/rabbitmq/config/policies/clean.sls @@ -1,25 +1 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls ---- -{%- set tplroot = tpldir.split('/')[0] %} -{%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - - {%- for name, node in rabbitmq.nodes.items() %} - {%- if 'policies' in node and node.policies is mapping %} - {%- for policy, p in node.policies.items() %} - -rabbitmq-config-policies-absent-{{ name }}-{{ policy }}: - rabbitmq_policy.absent: - {%- for v in p %} - {%- if 'name' in v %} - - {{ v|yaml }} - {%- endif %} - {%- endfor %} - - runas: rabbitmq - - onlyif: - - test -x /usr/sbin/rabbitmqctl - - test -d {{ rabbitmq.dir.data }} - - {%- endfor %} - {%- endif %} - {%- endfor %} +# not implemented diff --git a/rabbitmq/config/queues/clean.sls b/rabbitmq/config/queues/clean.sls index 1da09c5d..49e2c0d7 100644 --- a/rabbitmq/config/queues/clean.sls +++ b/rabbitmq/config/queues/clean.sls @@ -3,13 +3,11 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_clean = tplroot ~ '.service.clean' %} {%- set sls_config_users_clean = tplroot ~ '.config.users.clean' %} {%- set sls_config_vhosts_clean = tplroot ~ '.config.vhosts.clean' %} {%- set sls_config_plugins_clean = tplroot ~ '.config.plugins.clean' %} include: - - {{ sls_service_clean }} - {{ sls_config_plugins_clean }} - {{ sls_config_users_clean }} - {{ sls_config_vhosts_clean }} @@ -20,13 +18,13 @@ include: rabbitmq-config-queues-disabled-{{ name }}-{{ queue }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} delete queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} || true # noqa 204 + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} delete queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} || true # noqa 204 - onlyif: - test -x /usr/local/sbin/rabbitmqadmin - test -d {{ rabbitmq.dir.data }} + # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require_in: - - sls: {{ sls_service_clean }} - sls: {{ sls_config_plugins_clean }} - sls: {{ sls_config_users_clean }} - sls: {{ sls_config_vhosts_clean }} diff --git a/rabbitmq/config/queues/install.sls b/rabbitmq/config/queues/install.sls index 5bcec481..2e400b84 100644 --- a/rabbitmq/config/queues/install.sls +++ b/rabbitmq/config/queues/install.sls @@ -3,13 +3,11 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_running = tplroot ~ '.service.running' %} {%- set sls_config_plugins = tplroot ~ '.config.plugins.install' %} {%- set sls_config_users = tplroot ~ '.config.users.install' %} {%- set sls_config_vhosts = tplroot ~ '.config.vhosts.install' %} include: - - {{ sls_service_running }} - {{ sls_config_plugins }} - {{ sls_config_users }} - {{ sls_config_vhosts }} @@ -20,11 +18,12 @@ include: rabbitmq-config-queues-enabled-{{ name }}-{{ queue }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} # noqa 204 - - onlyif: test -x /usr/sbin/rabbitmqctl + - name: /usr/local/sbin/rabbitmqadmin --node {{ name }} --port={{ node.nodeport + 10000 }} declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ queue }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} # noqa 204 + - onlyif: + - test -x /usr/local/sbin/rabbitmqadmin + # /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management - runas: rabbitmq - require: - - service: rabbitmq-service-running-service-running-{{ name }} - sls: {{ sls_config_plugins }} - sls: {{ sls_config_users }} - sls: {{ sls_config_vhosts }} diff --git a/rabbitmq/config/upstreams/clean.sls b/rabbitmq/config/upstreams/clean.sls index b41c4aa5..e426215c 100644 --- a/rabbitmq/config/upstreams/clean.sls +++ b/rabbitmq/config/upstreams/clean.sls @@ -1,21 +1 @@ -# -*- coding: utf-8 -*- -# vim: ft=sls ---- -{%- set tplroot = tpldir.split('/')[0] %} -{%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} - - {%- for name, node in rabbitmq.nodes.items() %} - {%- if 'upstreams' in node and node.upstreams is mapping %} - {%- for upstream, p in node.upstreams.items() %} - -rabbitmq-config-upstreams-absent-{{ name }}-{{ upstream }}: - rabbitmq_upstream.absent: - - name: {{ upstream }} - - runas: rabbitmq - - onlyif: - - test -x /usr/sbin/rabbitmqctl - - test -d {{ rabbitmq.dir.data }} - - {%- endfor %} - {%- endif %} - {%- endfor %} +# not implemented diff --git a/rabbitmq/config/users/clean.sls b/rabbitmq/config/users/clean.sls index a45d2327..ec13d871 100644 --- a/rabbitmq/config/users/clean.sls +++ b/rabbitmq/config/users/clean.sls @@ -3,6 +3,10 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as r with context %} +{%- set sls_service_clean = tplroot ~ '.service.clean' %} + +include: + - {{ sls_service_clean }} {%- if grains.os_family == 'RedHat' and 'locale_all' in r.environ %} @@ -24,6 +28,8 @@ rabbitmq-config-users-deleted-{{ name }}-{{ user }}: - test -x /usr/sbin/rabbitmqctl - test -d {{ r.dir.data }} - runas: rabbitmq + - require_in: + - sls: {{ sls_service_clean }} {%- endfor %} {%- endif %} diff --git a/rabbitmq/config/users/install.sls b/rabbitmq/config/users/install.sls index 6d917eb0..d544c482 100644 --- a/rabbitmq/config/users/install.sls +++ b/rabbitmq/config/users/install.sls @@ -34,7 +34,6 @@ rabbitmq-config-users-added-{{ name }}-{{ user }}: - runas: rabbitmq - require: - service: rabbitmq-service-running-service-running-{{ name }} - - require_in: - sls: {{ sls_vhosts_install }} {%- endfor %} diff --git a/rabbitmq/config/vhosts/clean.sls b/rabbitmq/config/vhosts/clean.sls index 23d07a1e..892dfb55 100644 --- a/rabbitmq/config/vhosts/clean.sls +++ b/rabbitmq/config/vhosts/clean.sls @@ -3,12 +3,10 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_clean = tplroot ~ '.service.clean' %} {%- set sls_config_users_clean = tplroot ~ '.config.users.clean' %} {%- set sls_config_plugins_clean = tplroot ~ '.config.plugins.clean' %} include: - - {{ sls_service_clean }} - {{ sls_config_plugins_clean }} - {{ sls_config_users_clean }} @@ -24,7 +22,6 @@ rabbitmq-config-vhosts-delete-{{ name }}-{{ vhost }}: - test -d {{ rabbitmq.dir.data }} - runas: rabbitmq - require_in: - - sls: {{ sls_service_clean }} - sls: {{ sls_config_plugins_clean }} - sls: {{ sls_config_users_clean }} diff --git a/rabbitmq/config/vhosts/install.sls b/rabbitmq/config/vhosts/install.sls index ae382a3e..102ab873 100644 --- a/rabbitmq/config/vhosts/install.sls +++ b/rabbitmq/config/vhosts/install.sls @@ -3,12 +3,10 @@ --- {%- set tplroot = tpldir.split('/')[0] %} {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %} -{%- set sls_service_running = tplroot ~ '.service.running' %} {%- set sls_config_plugins = tplroot ~ '.config.plugins.install' %} {%- set sls_config_users = tplroot ~ '.config.users.install' %} include: - - {{ sls_service_running }} - {{ sls_config_plugins }} - {{ sls_config_users }} @@ -22,7 +20,6 @@ rabbitmq-config-vhosts-add-{{ name }}-{{ vhost }}: - onlyif: test -x /usr/sbin/rabbitmqctl - runas: rabbitmq - require: - - service: rabbitmq-service-running-service-running-{{ name }} - sls: {{ sls_config_plugins }} - require_in: - sls: {{ sls_config_users }} diff --git a/rabbitmq/service/running.sls b/rabbitmq/service/running.sls index 75f55093..ddefcb66 100644 --- a/rabbitmq/service/running.sls +++ b/rabbitmq/service/running.sls @@ -78,8 +78,7 @@ rabbitmq-service-running-service-running-{{ name }}: - file: rabbitmq-service-running-directory-{{ name }} - file: rabbitmq-service-running-managed-{{ name }} cmd.run: - - names: - - journalctl -xe -u {{ svcname }} || true + - name: systemctl status {{ svcname }} || true {%- endif %} {%- endfor %} diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 972a132d..1a458c80 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -35,14 +35,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -50,16 +49,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -69,23 +68,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -136,14 +135,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -151,37 +149,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index f85253e1..0171df93 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -35,14 +35,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -50,16 +49,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -69,23 +68,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -136,14 +135,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -151,37 +149,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 6d0a69b8..aabc26dc 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,44 +147,44 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost remove_guest_user: true service: true upstreams: - my-new-upstream1: + my-upstream1: - uri: 'amqp://saltstack_mq:password@localhost' - trust_user_id: true - ack_mode: on-confirm diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index fb8b858a..30ca3c68 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -31,14 +31,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -46,16 +45,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -65,30 +64,30 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost remove_guest_user: true service: true upstreams: - my-new-upstream1: + my-upstream1: - uri: 'amqp://saltstack_mq:password@localhost' - trust_user_id: true - ack_mode: on-confirm @@ -132,14 +131,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -147,44 +145,44 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost remove_guest_user: true service: true upstreams: - my-new-upstream1: + my-upstream1: - uri: 'amqp://saltstack_mq:password@localhost' - trust_user_id: true - ack_mode: on-confirm diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 139638bd..10d45a0a 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,36 +147,36 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 4bc20ff0..5cfe901e 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -35,14 +35,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -50,16 +49,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -69,23 +68,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -136,14 +135,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -151,37 +149,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index a6ac8b7e..56ee43b5 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -35,14 +35,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -50,16 +49,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -69,23 +68,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -136,14 +135,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -151,37 +149,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 1d1a1386..27e16dbb 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -35,14 +35,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -50,16 +49,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -69,23 +68,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -136,14 +135,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -151,37 +149,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 71a3953c..e8961ffc 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,37 +147,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index f2b5302a..2d357e94 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,37 +147,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index ee206a2f..d3159a23 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,37 +147,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 90f7f776..4bf1e879 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,37 +147,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost @@ -229,6 +227,7 @@ values: pkg: deps: - libtinfo5 + - erlang-eldap deps_disablerepo: '' name: rabbitmq-server use_upstream: repo diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index b4de93b0..a7ff6da9 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -33,14 +33,13 @@ values: rabbit: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: default_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: default_vhost clustered: false config: auth_backends.1: internal @@ -48,16 +47,16 @@ values: distport: 25672 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: default_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: default_vhost nodeport: 5672 plugins: - rabbitmq_management @@ -67,23 +66,23 @@ values: - rabbitmq_shovel - rabbitmq_shovel_management policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: default_vhost @@ -134,14 +133,13 @@ values: rabbit2: bindings: my-binding: - - destination_type: queue - - destination: my-queue - - routing_key: a_routing_key_string - - user: saltstack_mq - - passwd: password - - vhost: rabbit2_vhost - - arguments: - - x-message-ttl: 8640000 + destination: my-queue + destination_type: queue + passwd: password + routing_key: a_routing_key_string + source: amq.topic + user: saltstack_mq + vhost: rabbit2_vhost clustered: false # true config: auth_backends.1: internal @@ -149,37 +147,37 @@ values: distport: 25673 exchanges: my-exchange: - - user: saltstack_mq - - passwd: password - - type: fanout - - durable: true - - internal: false - - auto_delete: false - - vhost: rabbit2_vhost - - arguments: + arguments: - alternate-**exchange: amq.fanout - test-header: testing + auto_delete: 'false' + durable: 'true' + internal: 'false' + passwd: password + type: fanout + user: saltstack_mq + vhost: rabbit2_vhost join_node: rabbit # create multinode cluster on localhost nodeport: 5673 plugins: [] policies: - my-ha-policy: - - name: HA - - pattern: '.*' - - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' my-federate-policy: - name: federate-me - pattern: '^federated\.' - definition: '{"federation-upstream-set":"all"}' - priority: 1 + my-ha-policy: + - name: HA + - pattern: '.*' + - definition: '{"ha-mode":"nodes","ha-params":["rabbit", "rabbit2"]}' queues: my-queue: arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-exchange - auto_delete: false - durable: true + auto_delete: 'false' + durable: 'true' passwd: password user: saltstack_mq vhost: rabbit2_vhost @@ -229,6 +227,7 @@ values: pkg: deps: - libtinfo5 + - erlang-eldap deps_disablerepo: '' name: rabbitmq-server use_upstream: repo diff --git a/test/integration/nopillars/files/_mapdata/centos-7.yaml b/test/integration/nopillars/files/_mapdata/centos-7.yaml index 98525817..6da06fe6 100644 --- a/test/integration/nopillars/files/_mapdata/centos-7.yaml +++ b/test/integration/nopillars/files/_mapdata/centos-7.yaml @@ -35,11 +35,7 @@ values: - rabbitmq_federation - rabbitmq_federation_management - rabbitmq_auth_backend_ldap - policy: - rabbitmq_policy: - - name: HA - - pattern: ".*" - - definition: '{"ha-mode": "all"}' + policies: {} queues: {} remove_guest_user: true service: true