Merge pull request #72 from noelmcloughlin/user

fix(user): fix rendering error for user; fix ci
saltstack-formulas · May 21, 2021 · e22c7c3 · e22c7c3
2 parents ddd0bc5 + 346df02
commit e22c7c3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 4 deletions.
diff --git a/rabbitmq/config/user/install.sls b/rabbitmq/config/user/install.sls
@@ -14,9 +14,8 @@ include:
 
 rabbitmq-config-user-present-{{ name }}:
   rabbitmq_user.present:
-    {% for value in user %}
-    - {{ value | json }}
-    {% endfor %}
+    - name: {{ name }}
+    - {{ user|yaml }}
     - require:
       - sls: {{ sls_service_running }}
       - sls: {{ sls_config_vhost }}

diff --git a/rabbitmq/package/install.sls b/rabbitmq/package/install.sls
@@ -8,6 +8,12 @@
 include:
   - {{ sls_repo_install }}
 
+    {%- if rabbitmq.pkg.deps %}
+rabbitmq-package-install-pkg-deps:
+  pkg.installed:
+    - names: {{ rabbitmq.pkg.deps|json }}
+    {%- endif %}
+
 rabbitmq-package-install-pkg-installed:
   pkg.installed:
     - env:

diff --git a/rabbitmq/parameters/defaults.yaml b/rabbitmq/parameters/defaults.yaml
@@ -8,6 +8,7 @@ values:
     name: rabbitmq-server
     # https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.8.14
     use_upstream: repo    # use upstream repo (if applicable)
+    deps: []
   dir:
     base: /usr/lib/rabbitmq
     data: /var/lib/rabbitmq

diff --git a/rabbitmq/parameters/os_family/Debian.yaml b/rabbitmq/parameters/os_family/Debian.yaml
@@ -11,5 +11,8 @@
 # you can remove this file or provide at least an empty dict, e.g.
 # values: {}
 ---
-values: {}
+values:
+  pkg:
+    deps:
+      - libtinfo5
 ...
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -58,6 +58,8 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps:
+      - libtinfo5
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -58,6 +58,8 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps:
+      - libtinfo5
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -58,6 +58,7 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps: []
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -58,6 +58,7 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps: []
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -58,6 +58,7 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps: []
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -58,6 +58,8 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps:
+      - libtinfo5
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -58,6 +58,8 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps:
+      - libtinfo5
     name: rabbitmq-server
     use_upstream: repo
   plugin:

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -58,6 +58,8 @@ values:
     - C@rabbitmq
     - Y:G@id
   pkg:
+    deps:
+      - libtinfo5
     name: rabbitmq-server
     use_upstream: repo
   plugin: