fix(requisites): match state name and ci

saltstack-formulas · Jun 15, 2021 · af42400 · af42400
1 parent ec02702
commit af42400
Show file tree

Hide file tree

Showing 24 changed files with 275 additions and 198 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,10 +17,13 @@ values:
       - x-message-ttl: 8640000
   cluster:
     rabbit@locahost:
-    - user: rabbit
-    - host: localhost
-    - ram_node: None
-    - runas: root
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
   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
@@ -17,10 +17,13 @@ values:
       - x-message-ttl: 8640000
   cluster:
     rabbit@locahost:
-    - user: rabbit
-    - host: localhost
-    - ram_node: None
-    - runas: root
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
   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
@@ -17,10 +17,14 @@ values:
       - x-message-ttl: 8640000
   cluster:
     rabbit@locahost:
-    - user: rabbit
-    - host: localhost
-    - ram_node: None
-    - runas: root
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
+
   config:
     context: {}
     name: /etc/rabbitmq.conf
@@ -29,6 +33,7 @@ values:
     cleanlist:
     - /usr/local/bin/rabbitmq-env
     - /usr/local/bin/rabbitmq-plugins
+    - /var/run/rabbitmq
     data: /var/lib/rabbitmq
   env:
     context:
@@ -72,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/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
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
   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
@@ -17,10 +17,13 @@ values:
       - x-message-ttl: 8640000
   cluster:
     rabbit@locahost:
-    - user: rabbit
-    - host: localhost
-    - ram_node: None
-    - runas: root
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
   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
@@ -17,10 +17,13 @@ values:
       - x-message-ttl: 8640000
   cluster:
     rabbit@locahost:
-    - user: rabbit
-    - host: localhost
-    - ram_node: None
-    - runas: root
+      erlang_cookie:
+        name: /var/lib/rabbitmq/.erlang.cookie
+        value: shared-value-for-all-cluster-members
+      host: localhost
+      ram_node: None
+      runas: root
+      user: rabbit
   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