From d7fe076ab4a31ab053e44ed2a2574b2fbe4e5180 Mon Sep 17 00:00:00 2001 From: noelmcloughlin Date: Wed, 9 Jun 2021 09:22:51 +0100 Subject: [PATCH] fix(requisites): match state name and ci --- pillar.example | 13 +++++----- rabbitmq/config/policy/install.sls | 2 +- rabbitmq/config/queue/clean.sls | 4 ++-- rabbitmq/config/queue/install.sls | 6 ++--- rabbitmq/config/upstream/install.sls | 2 +- rabbitmq/parameters/defaults.yaml | 13 +++++++--- .../default/files/_mapdata/amazonlinux-2.yaml | 24 +++++++++++-------- .../files/_mapdata/arch-base-latest.yaml | 24 +++++++++++-------- .../default/files/_mapdata/centos-7.yaml | 24 +++++++++++-------- .../default/files/_mapdata/centos-8.yaml | 24 +++++++++++-------- .../default/files/_mapdata/debian-10.yaml | 24 +++++++++++-------- .../default/files/_mapdata/debian-9.yaml | 24 +++++++++++-------- .../default/files/_mapdata/fedora-32.yaml | 24 +++++++++++-------- .../default/files/_mapdata/fedora-33.yaml | 24 +++++++++++-------- .../default/files/_mapdata/fedora-34.yaml | 24 +++++++++++-------- .../default/files/_mapdata/gentoo-2-sysd.yaml | 24 +++++++++++-------- .../default/files/_mapdata/gentoo-2-sysv.yaml | 24 +++++++++++-------- .../default/files/_mapdata/opensuse-15.yaml | 24 +++++++++++-------- .../files/_mapdata/opensuse-tumbleweed.yaml | 24 +++++++++++-------- .../default/files/_mapdata/oraclelinux-7.yaml | 24 +++++++++++-------- .../default/files/_mapdata/oraclelinux-8.yaml | 24 +++++++++++-------- .../default/files/_mapdata/ubuntu-16.yaml | 24 +++++++++++-------- .../default/files/_mapdata/ubuntu-18.yaml | 24 +++++++++++-------- .../default/files/_mapdata/ubuntu-20.yaml | 24 +++++++++++-------- 24 files changed, 274 insertions(+), 198 deletions(-) diff --git a/pillar.example b/pillar.example index aa6243ca..dacc5a84 100644 --- a/pillar.example +++ b/pillar.example @@ -4,14 +4,13 @@ rabbitmq: cluster: rabbit@locahost: - user: rabbit # 'user: rabbit' is confusing; 'node: rabbit' would be better - host: hostname # short hostname of node to join to, not fqdn + host: localhost # short hostname of node to join to, not fqdn ram_node: None runas: rabbitmq + user: rabbit # 'node' would make more sense here erlang_cookie: name: /var/lib/rabbitmq/.erlang.cookie value: shared-value-for-all-cluster-members - pkg: # https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.8.14 use_upstream: repo # if available (i.e. packagecloud) @@ -47,14 +46,14 @@ rabbitmq: my-new-queue: ## note : dict format user: saltstack - passwd: 'password' + passwd: password durable: true auto_delete: false vhost: test_vhost arguments: - - 'x-message-ttl': 8640000 - - 'x-expires': 8640000 - - 'x-dead-letter-exchange': 'my-new-exchange' + - x-message-ttl: 8640000 + - x-expires: 8640000 + - x-dead-letter-exchange: my-new-exchange exchange: my-new-exchange: diff --git a/rabbitmq/config/policy/install.sls b/rabbitmq/config/policy/install.sls index 9980b63a..4eaa67c8 100644 --- a/rabbitmq/config/policy/install.sls +++ b/rabbitmq/config/policy/install.sls @@ -16,6 +16,6 @@ rabbitmq-config-policy-present-{{ name }}: - {{ value | json }} {% endfor %} - require: - - service: {{ rabbitmq.service.name }} + - service: rabbitmq-service-running-service-running {% endfor %} diff --git a/rabbitmq/config/queue/clean.sls b/rabbitmq/config/queue/clean.sls index faba5158..687fd3a5 100644 --- a/rabbitmq/config/queue/clean.sls +++ b/rabbitmq/config/queue/clean.sls @@ -12,8 +12,8 @@ include: rabbitmq-config-queue-absent-{{ name }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin delete queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ name }} + - name: /usr/local/sbin/rabbitmqadmin delete queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ name }} # noqa 204 - require: - - service: {{ rabbitmq.service.name }} + - service: rabbitmq-service-running-service-running {% endfor %} diff --git a/rabbitmq/config/queue/install.sls b/rabbitmq/config/queue/install.sls index 4d85bc8e..8e64bc5a 100644 --- a/rabbitmq/config/queue/install.sls +++ b/rabbitmq/config/queue/install.sls @@ -12,10 +12,8 @@ include: rabbitmq-config-queue-present-{{ name }}: cmd.run: - - name: /usr/local/sbin/rabbitmqadmin declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ name }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} - - ### note: arguments='{# q.arguments|json #}' causes "mapping values are not allowed in this context" + - name: /usr/local/sbin/rabbitmqadmin declare queue --vhost={{ q.vhost }} --username={{ q.user }} --password={{ q.passwd }} name={{ name }} durable={{ q.durable|to_bool|lower }} auto_delete={{ q.auto_delete|to_bool|lower }} # noqa 204 - require: - - service: {{ rabbitmq.service.name }} + - service: rabbitmq-service-running-service-running {% endfor %} diff --git a/rabbitmq/config/upstream/install.sls b/rabbitmq/config/upstream/install.sls index 61899d34..ac560b5b 100644 --- a/rabbitmq/config/upstream/install.sls +++ b/rabbitmq/config/upstream/install.sls @@ -16,6 +16,6 @@ rabbitmq-config-upstream-present-{{ name }}: - {{ value | json }} {% endfor %} - require: - - service: {{ rabbitmq.service.name }} + - service: rabbitmq-service-running-service-running {% endfor %} diff --git a/rabbitmq/parameters/defaults.yaml b/rabbitmq/parameters/defaults.yaml index 07f66bcf..0e8ef0c7 100644 --- a/rabbitmq/parameters/defaults.yaml +++ b/rabbitmq/parameters/defaults.yaml @@ -4,6 +4,15 @@ # Set default values. --- values: + cluster: + rabbit@locahost: + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members + host: localhost # short hostname of node to join to, not fqdn + ram_node: None + runas: root + user: rabbit # 'node' would make more sense here pkg: name: rabbitmq-server # https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.8.14 @@ -23,11 +32,9 @@ values: rabbitmq_mnesia_base: /var/lib/rabbitmq RABBITMQ_BASE: /var/lib/rabbitmq config: + context: {} name: /etc/rabbitmq/rabbitmq.conf - user: rabbitmq - group: rabbitmq # see rabbitmq.conf.example from rabbitmq-server github docs - context: {} service: name: rabbitmq-server enabled: true diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 38f7a098..5c2211ff 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 3081a555..b016bcfe 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 51b04c3b..4e295c82 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index ae2da7ed..573ff797 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 20a62c3a..ed4cfda9 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -74,15 +78,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 6a5d7169..ae4ae81a 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -74,15 +78,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 289c39d1..769a1f9a 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -73,15 +77,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 1a751b83..4d1ae081 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -73,15 +77,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index 6980a32e..2df2fc7c 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -73,15 +77,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 7dcad0d2..8ce652ba 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 7dcad0d2..8ce652ba 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 7255b555..74b409aa 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 56a9c050..8b99794e 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index aec30716..83e83723 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 75e9bc36..089e98c7 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -72,15 +76,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index f11d4070..ce75731c 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -74,15 +78,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 7bc246b9..2495b18a 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -74,15 +78,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 6cbc2b51..cc518feb 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -17,10 +17,13 @@ values: - x-message-ttl: 8640000 cluster: rabbit@locahost: - - user: rabbit - - host: localhost - - ram_node: None - - runas: root + user: rabbit + host: localhost + ram_node: None + runas: root + erlang_cookie: + name: /var/lib/rabbitmq/.erlang.cookie + value: shared-value-for-all-cluster-members config: context: {} name: /etc/rabbitmq/rabbitmq.conf @@ -29,6 +32,7 @@ values: cleanlist: - /usr/local/bin/rabbitmq-env - /usr/local/bin/rabbitmq-plugins + - /var/run/rabbitmq data: /var/lib/rabbitmq env: context: @@ -74,15 +78,15 @@ values: - definition: '{"ha-mode": "all"}' queue: my-new-queue: - - user: saltstack - - passwd: password - - durable: true - - auto_delete: false - - vhost: test_vhost - - arguments: + arguments: - x-message-ttl: 8640000 - x-expires: 8640000 - x-dead-letter-exchange: my-new-exchange + auto_delete: false + durable: true + passwd: password + user: saltstack + vhost: test_vhost remove_guest_user: true retry_option: attempts: 0