Skip to content

Commit 855e139

Browse files
jeff350jeff350
authored
Merge pull request #131 from sylvainfaivre/fix-ubuntu-22-ci
ci: fix Ubuntu 22.04 expected mapdata
2 parents f3eed93 + 99ff275 commit 855e139

File tree

2 files changed

+249
-22
lines changed

2 files changed

+249
-22
lines changed

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ debian-11-master-py3: {extends: '.test_instance'}
153153
# debian-9-master-py3: {extends: '.test_instance'}
154154
# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
155155
# nopillars-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
156-
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
156+
ubuntu-2204-master-py3: {extends: '.test_instance'}
157157
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
158158
# nopillars-ubuntu-2004-master-py3: {extends: '.test_instance'}
159159
ubuntu-2004-master-py3: {extends: '.test_instance'}

‎test/integration/default/files/_mapdata/ubuntu-22.yaml

+248-21
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,266 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=yaml
13
# yamllint disable rule:indentation rule:line-length
4+
# Ubuntu 22
25
---
36
values:
47
added_in_defaults: defaults_value
8+
added_in_pillar: pillar_value
59
arch: amd64
610
dir:
7-
base: "/usr/lib/rabbitmq"
11+
base: "/var/lib/rabbitmq"
812
cleanlist:
9-
- "/usr/local/bin/rabbitmq-env"
10-
- "/usr/local/bin/rabbitmq-plugins"
11-
- "/var/run/rabbitmq"
13+
- "/usr/local/bin/rabbitmq-env"
14+
- "/usr/local/bin/rabbitmq-plugins"
15+
- "/var/run/rabbitmq"
1216
config: "/etc/rabbitmq"
1317
data: "/var/lib/rabbitmq"
1418
service: "/usr/lib/systemd/system"
15-
environ: {}
19+
environ:
20+
locale_all: en_US.UTF-8
21+
values: {}
1622
erlang_cookie: shared-secret
1723
map_jinja:
1824
sources:
19-
- Y:G@osarch
20-
- Y:G@os_family
21-
- Y:G@os
22-
- Y:G@osfinger
23-
- C@rabbitmq:lookup
24-
- C@rabbitmq
25-
- Y:G@id
25+
- Y:G@osarch
26+
- Y:G@os_family
27+
- Y:G@os
28+
- Y:G@osfinger
29+
- C@rabbitmq:lookup
30+
- C@rabbitmq
31+
- Y:G@id
2632
nodes:
2733
rabbit:
34+
bindings:
35+
my-binding:
36+
destination: my-queue
37+
destination_type: queue
38+
passwd: password
39+
routing_key: a_routing_key_string
40+
source: amq.topic
41+
user: saltstack_mq
42+
vhost: default_vhost
2843
clustered: false
29-
config: {}
44+
config:
45+
auth_backends.1: internal
46+
consumer_timeout: 3600000
47+
listeners.tcp.1: 0.0.0.0:5672
3048
distport: 25672
49+
exchanges:
50+
my-exchange:
51+
arguments:
52+
alternate-**exchange: amq.fanout
53+
test-header: testing
54+
auto_delete: 'false'
55+
durable: 'true'
56+
internal: 'false'
57+
passwd: password
58+
type: fanout
59+
user: saltstack_mq
60+
vhost: default_vhost
3161
nodeport: 5672
32-
parameters: {}
62+
parameters:
63+
my-federation-upstream-set:
64+
component: federation-upstream-set
65+
definition:
66+
upstream: my-federation-upstream1
67+
vhost: default_vhost
68+
my-federation-upstream1:
69+
component: federation-upstream
70+
definition:
71+
ack-mode: on-confirm
72+
max-hops: 1
73+
trust-user-id: true
74+
uri: 'amqp://saltstack_mq:password@localhost'
75+
vhost: default_vhost
3376
plugins:
3477
- rabbitmq_management
3578
- rabbitmq_federation
3679
- rabbitmq_federation_management
3780
- rabbitmq_auth_backend_ldap
38-
policies: {}
39-
queues: {}
81+
- rabbitmq_shovel
82+
- rabbitmq_shovel_management
83+
policies:
84+
my-federation-policy1:
85+
definition:
86+
federation-upstream-set: all
87+
pattern: '^federated1\.'
88+
priority: 1
89+
vhost: default_vhost
90+
my-federation-policy2:
91+
definition:
92+
federation-upstream-set: my-federation-upstream-set
93+
pattern: '^federated2\.'
94+
priority: 1
95+
vhost: default_vhost
96+
my-ha-policy:
97+
definition:
98+
ha-mode: nodes
99+
ha-params: ["rabbit", "rabbit2"]
100+
pattern: '.*'
101+
priority: 1
102+
vhost: default_vhost
103+
queues:
104+
my-queue:
105+
auto_delete: 'false'
106+
durable: 'true'
107+
passwd: password
108+
user: saltstack_mq
109+
vhost: default_vhost
40110
remove_guest_user: true
41111
service: true
42-
users: {}
43-
vhosts: {}
112+
users:
113+
airflow:
114+
force: true
115+
password: airflow
116+
perms:
117+
default_vhost:
118+
- ".*"
119+
- ".*"
120+
- ".*"
121+
tags:
122+
- management
123+
- administrator
124+
saltstack_mq:
125+
force: false
126+
password: password
127+
perms:
128+
default_vhost:
129+
- ".*"
130+
- ".*"
131+
- ".*"
132+
tags:
133+
- administrator
134+
- management
135+
user1:
136+
force: true
137+
password: password
138+
perms:
139+
default_vhost:
140+
- ".*"
141+
- ".*"
142+
- ".*"
143+
tags:
144+
- monitoring
145+
- user
146+
vhosts:
147+
- default_vhost
148+
rabbit2:
149+
bindings:
150+
my-binding:
151+
destination: my-queue
152+
destination_type: queue
153+
passwd: password
154+
routing_key: a_routing_key_string
155+
source: amq.topic
156+
user: saltstack_mq
157+
vhost: rabbit2_vhost
158+
clustered: false # true
159+
config:
160+
auth_backends.1: internal
161+
listeners.tcp.1: 0.0.0.0:5673
162+
distport: 25673
163+
exchanges:
164+
my-exchange:
165+
arguments:
166+
alternate-**exchange: amq.fanout
167+
test-header: testing
168+
auto_delete: 'false'
169+
durable: 'true'
170+
internal: 'false'
171+
passwd: password
172+
type: fanout
173+
user: saltstack_mq
174+
vhost: rabbit2_vhost
175+
join_node: rabbit # create multinode cluster on localhost
176+
nodeport: 5673
177+
parameters:
178+
my-federation-upstream-set:
179+
component: federation-upstream-set
180+
definition:
181+
upstream: my-federation-upstream1
182+
vhost: rabbit2_vhost
183+
my-federation-upstream1:
184+
component: federation-upstream
185+
definition:
186+
ack-mode: on-confirm
187+
max-hops: 1
188+
trust-user-id: true
189+
uri: 'amqp://saltstack_mq:password@localhost'
190+
vhost: rabbit2_vhost
191+
plugins: []
192+
policies:
193+
my-federation-policy1:
194+
definition:
195+
federation-upstream-set: all
196+
pattern: '^federated1\.'
197+
priority: 1
198+
vhost: rabbit2_vhost
199+
my-federation-policy2:
200+
definition:
201+
federation-upstream-set: my-federation-upstream-set
202+
pattern: '^federated2\.'
203+
priority: 1
204+
vhost: rabbit2_vhost
205+
my-ha-policy:
206+
definition:
207+
ha-mode: nodes
208+
ha-params: ["rabbit", "rabbit2"]
209+
pattern: '.*'
210+
priority: 1
211+
vhost: rabbit2_vhost
212+
queues:
213+
my-queue:
214+
arguments:
215+
x-dead-letter-exchange: my-exchange
216+
x-expires: 8640000
217+
x-queue-type: quorum
218+
auto_delete: 'false'
219+
durable: 'true'
220+
passwd: password
221+
user: saltstack_mq
222+
vhost: rabbit2_vhost
223+
remove_guest_user: true
224+
service: true
225+
users:
226+
airflow:
227+
force: true
228+
password: airflow
229+
perms:
230+
rabbit2_vhost:
231+
- ".*"
232+
- ".*"
233+
- ".*"
234+
tags:
235+
- management
236+
- administrator
237+
saltstack_mq:
238+
force: false
239+
password: password
240+
perms:
241+
rabbit2_vhost:
242+
- ".*"
243+
- ".*"
244+
- ".*"
245+
tags:
246+
- administrator
247+
user1:
248+
force: true
249+
password: password
250+
perms:
251+
rabbit2_vhost:
252+
- ".*"
253+
- ".*"
254+
- ".*"
255+
tags:
256+
- monitoring
257+
- user
258+
vhosts:
259+
- rabbit2_vhost
44260
pkg:
45261
deps:
46-
- libtinfo5
47-
- erlang-eldap
262+
- libtinfo5
263+
- erlang-eldap
48264
deps_disablerepo: ''
49265
name: rabbitmq-server
50266
remove_os_erlang: true
@@ -62,4 +278,15 @@ values:
62278
splay: 10
63279
until: true
64280
rootgroup: root
65-
winner: defaults
281+
tofs:
282+
files_switch:
283+
- any/path/can/be/used/here
284+
- id
285+
- roles
286+
- osfinger
287+
- os
288+
- os_family
289+
source_files:
290+
rabbitmq-config-file-file-managed:
291+
- example.tmpl.jinja
292+
winner: pillar

0 commit comments

Comments
 (0)