diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml deleted file mode 100644 index ad904679..00000000 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Amazon Linux AMI-2018 ---- -values: - added_in_defaults: defaults_value - added_in_lookup: lookup_value - added_in_pillar: pillar_value - arch: amd64 - config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup - map_jinja: - sources: - - Y:G@osarch - - Y:G@os_family - - Y:G@os - - Y:G@osfinger - - C@rabbitmq:lookup - - C@rabbitmq - - Y:G@id - master: template-master - pkg: - name: cronie - rootgroup: root - service: - name: crond - tofs: - files_switch: - - any/path/can/be/used/here - - id - - roles - - osfinger - - os - - os_family - source_files: - rabbitmq-config-file-file-managed: - - example.tmpl.jinja - winner: pillar diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 31464d10..38f7a098 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index dcf47546..3081a555 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml deleted file mode 100644 index 0f8f73ec..00000000 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# CentOS-6 ---- -values: - added_in_defaults: defaults_value - added_in_lookup: lookup_value - added_in_pillar: pillar_value - arch: amd64 - config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup - map_jinja: - sources: - - Y:G@osarch - - Y:G@os_family - - Y:G@os - - Y:G@osfinger - - C@rabbitmq:lookup - - C@rabbitmq - - Y:G@id - master: template-master - pkg: - name: cronie - rootgroup: root - service: - name: crond - tofs: - files_switch: - - any/path/can/be/used/here - - id - - roles - - osfinger - - os - - os_family - source_files: - rabbitmq-config-file-file-managed: - - example.tmpl.jinja - winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index b4e49004..51b04c3b 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 74d6a1f4..ae2da7ed 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 02e7e5e8..7274a214 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 129513cd..42a86537 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml deleted file mode 100644 index f6396fd3..00000000 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Fedora-31 ---- -values: - added_in_defaults: defaults_value - added_in_lookup: lookup_value - added_in_pillar: pillar_value - arch: amd64 - config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup - map_jinja: - sources: - - Y:G@osarch - - Y:G@os_family - - Y:G@os - - Y:G@osfinger - - C@rabbitmq:lookup - - C@rabbitmq - - Y:G@id - master: template-master - pkg: - name: bash - rootgroup: root - service: - name: systemd-journald - tofs: - files_switch: - - any/path/can/be/used/here - - id - - roles - - osfinger - - os - - os_family - source_files: - rabbitmq-config-file-file-managed: - - example.tmpl.jinja - winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index 4c79c1d4..e65e1216 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 18c3568f..aba3cc95 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 88e2d06c..7dcad0d2 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: app-shells/bash + name: net-misc/rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index a1ea544c..7dcad0d2 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: app-shells/bash + name: net-misc/rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: mtab + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 35608fa1..7255b555 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 030ef5c2..56a9c050 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -1,17 +1,53 @@ # yamllint disable rule:indentation rule:line-length -# openSUSE Tumbleweed-yyyymmdd +# openSUSE Tumbleweed-20210210 --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index fdb05995..aec30716 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 567459d1..75e9bc36 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 52e1fc7c..122af2b5 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 98060a65..1d0c2095 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 7352f9d3..cfda7b88 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -3,15 +3,51 @@ --- values: added_in_defaults: defaults_value - added_in_lookup: lookup_value added_in_pillar: pillar_value arch: amd64 + binding: + my-new-binding: + - destination_type: queue + - destination: my-new-queue + - routing_key: a_routing_key_string + - user: saltstack + - passwd: password + - vhost: test_vhost + - arguments: + - x-message-ttl: 8640000 + cluster: + rabbit@locahost: + - user: rabbit + - host: localhost + - ram_node: None + - runas: root config: - name: /etc/rabbitmq-formula.conf - lookup: - added_in_lookup: lookup_value - master: template-master - winner: lookup + context: {} + name: /etc/rabbitmq/rabbitmq.conf + dir: + base: /var/lib/rabbitmq + cleanlist: + - /usr/local/bin/rabbitmq-env + - /usr/local/bin/rabbitmq-plugins + data: /var/lib/rabbitmq + env: + context: + RABBITMQ_BASE: /var/lib/rabbitmq + rabbitmq_mnesia_base: /var/lib/rabbitmq + locale_all: en_US.UTF-8 + name: /etc/rabbitmq/rabbitmq-env.conf + exchange: + my-new-exchange: + - user: saltstack + - passwd: password + - type: fanout + - durable: true + - internal: false + - auto_delete: false + - vhost: test_vhost + - arguments: + - alternate-**exchange: amq.fanout + - test-header: testing map_jinja: sources: - Y:G@osarch @@ -21,12 +57,41 @@ values: - C@rabbitmq:lookup - C@rabbitmq - Y:G@id - master: template-master pkg: - name: bash + name: rabbitmq-server + use_upstream: repo + plugin: + rabbitmq_federation: + runas: root + rabbitmq_management: + runas: root + policy: + rabbitmq_policy: + - name: HA + - pattern: .* + - definition: '{"ha-mode": "all"}' + queue: + my-new-queue: + - user: saltstack + - 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 + remove_guest_user: true + retry_option: + attempts: 0 + interval: 60 + splay: 10 + until: true rootgroup: root service: - name: systemd-journald + enabled: true + name: rabbitmq-server + running: true tofs: files_switch: - any/path/can/be/used/here @@ -38,4 +103,44 @@ values: source_files: rabbitmq-config-file-file-managed: - example.tmpl.jinja + upstream: + upstream_1: + - uri: amqp://saltstack:password@localhost + - trust_user_id: true + - ack_mode: on-confirm + - max_hops: 1 + user: + saltstack: + - password: password + - force: false + - tags: + - administrator + - perms: + - test_vhost: + - .* + - .* + - .* + - runas: root + user1: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + user2: + - password: password + - force: true + - tags: monitoring, user + - perms: + - /: + - .* + - .* + - .* + - runas: root + vhost: + - test_vhost winner: pillar