fix(jinja2): use final merged values instead of pillars

saltstack-formulas · Jul 27, 2021 · b1f5495 · b1f5495
1 parent 9c95eb2
commit b1f5495
Show file tree

Hide file tree

Showing 55 changed files with 80 additions and 74 deletions.
diff --git a/rabbitmq/config/bindings/clean.sls b/rabbitmq/config/bindings/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'bindings' in node and node.bindings is mapping %}
             {%- for binding, q in node.bindings.items() %}
 

diff --git a/rabbitmq/config/bindings/install.sls b/rabbitmq/config/bindings/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'bindings' in node and node.bindings is mapping %}
             {%- for binding, ex in node.bindings.items() %}
 

diff --git a/rabbitmq/config/clusters/clean.sls b/rabbitmq/config/clusters/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'clustered' in node and node.clustered and 'join_node' in node %}
 
 rabbitmq-config-clusters-{{ name }}-leave-{{ node.join_node }}:

diff --git a/rabbitmq/config/clusters/install.sls b/rabbitmq/config/clusters/install.sls
@@ -12,7 +12,7 @@ include:
   - {{ sls_config_users }}
   - {{ sls_config_files }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'clustered' in node and node.clustered and 'join_node' in node %}
             {%- if 'erlang_cookie' in node and node.erlang_cookie %}
 

diff --git a/rabbitmq/config/exchanges/clean.sls b/rabbitmq/config/exchanges/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'exchanges' in node and node.exchanges is mapping %}
             {%- for exchange, q in node.exchanges.items() %}
 

diff --git a/rabbitmq/config/exchanges/install.sls b/rabbitmq/config/exchanges/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'exchanges' in node and node.exchanges is mapping %}
             {%- for exchange, ex in node.exchanges.items() %}
 

diff --git a/rabbitmq/config/files/clean.sls b/rabbitmq/config/files/clean.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_package_clean }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
 
 rabbitmq-config-files-absent-{{ name }}:
   file.absent:

diff --git a/rabbitmq/config/files/install.sls b/rabbitmq/config/files/install.sls
@@ -9,7 +9,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'config' in node and node.config is mapping %}
 
 rabbitmq-config-files-managed-{{ name }}:

diff --git a/rabbitmq/config/params/install.sls b/rabbitmq/config/params/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'params' in node and node.params is mapping %}
             {%- for param, items in node.params.items() %}
 

diff --git a/rabbitmq/config/plugins/clean.sls b/rabbitmq/config/plugins/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'plugins' in node and node.plugins is iterable and node.plugins is not string %}
             {%- for plugin in node.plugins %}
 

diff --git a/rabbitmq/config/plugins/install.sls b/rabbitmq/config/plugins/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'plugins' in node and node.plugins is iterable and node.plugins is not string %}
             {%- for plugin in node.plugins %}
 

diff --git a/rabbitmq/config/policies/clean.sls b/rabbitmq/config/policies/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'policies' in node and node.policies is mapping %}
             {%- for policy, items in node.policies.items() %}
 

diff --git a/rabbitmq/config/policies/install.sls b/rabbitmq/config/policies/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'policies' in node and node.policies is mapping %}
             {%- for policy, items in node.policies.items() %}
 

diff --git a/rabbitmq/config/queues/clean.sls b/rabbitmq/config/queues/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'queues' in node and node.queues is mapping %}
             {%- for queue, q in node.queues.items() %}
 

diff --git a/rabbitmq/config/queues/install.sls b/rabbitmq/config/queues/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'queues' in node and node.queues is mapping %}
             {%- for queue, q in node.queues.items() %}
 

diff --git a/rabbitmq/config/upstreams/clean.sls b/rabbitmq/config/upstreams/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'upstreams' in node and node.upstreams is mapping %}
             {%- for upstream, items in node.upstreams.items() %}
 

diff --git a/rabbitmq/config/upstreams/install.sls b/rabbitmq/config/upstreams/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'upstreams' in node and node.upstreams is mapping %}
             {%- for upstream, items in node.upstreams.items() %}
 

diff --git a/rabbitmq/config/users/clean.sls b/rabbitmq/config/users/clean.sls
@@ -13,7 +13,7 @@ rabbitmq-config-users-environ-locale:
     - update_minion: True
 
     {%- endif %}
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'users' in node and node.users is mapping %}
             {%- for user, items in node.users.items() %}
 

diff --git a/rabbitmq/config/users/install.sls b/rabbitmq/config/users/install.sls
@@ -11,7 +11,7 @@ include:
   - {{ sls_service_running }}
   - {{ sls_vhosts_install }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'users' in node and node.users is mapping %}
             {%- for user, u in node.users.items() %}
 

diff --git a/rabbitmq/config/vhosts/clean.sls b/rabbitmq/config/vhosts/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'vhosts' in node and node.vhosts is iterable and node.vhosts is not string %}
             {%- for vhost in node.vhosts %}
 

diff --git a/rabbitmq/config/vhosts/install.sls b/rabbitmq/config/vhosts/install.sls
@@ -8,7 +8,7 @@
 include:
   - {{ sls_service_running }}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'vhosts' in node and node.vhosts is iterable and node.vhosts is not string %}
             {%- for vhost in node.vhosts %}
 

diff --git a/rabbitmq/service/clean.sls b/rabbitmq/service/clean.sls
@@ -4,7 +4,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import mapdata as rabbitmq with context %}
 
-    {%- for name, node in salt["pillar.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'service' in node and node.service %}
             {%- set svcname = 'rabbitmq-server' %}
             {%- if name != 'rabbit' %}

diff --git a/rabbitmq/service/running.sls b/rabbitmq/service/running.sls
@@ -11,7 +11,7 @@ include:
   - {{ sls_config_files }}
   - {{ sls_config_users }}
 
-    {%- for name, node in salt["config.get"]("rabbitmq:nodes", {}).items() %}
+    {%- for name, node in rabbitmq.nodes.items() %}
         {%- if 'service' in node and node.service %}
             {%- set svcname = 'rabbitmq-server' %}
             {%- if name != 'rabbit' %}

diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -87,7 +87,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -87,7 +87,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -83,7 +83,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -87,7 +87,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -87,7 +87,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -87,7 +87,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -85,7 +85,6 @@ values:
           vhost: default_vhost
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       upstream:
         my-new-upstream1:

diff --git a/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml b/test/integration/nopillars/files/_mapdata/amazonlinux-2.yaml
@@ -27,7 +27,9 @@ values:
     rabbit:
       clustered: false
       config: {}
-      erlang_cookie: ''
+      distport: 25672
+      erlang_cookie: shared-secret
+      nodeport: 5672
       plugins:
         - rabbitmq_management
         - rabbitmq_federation
@@ -39,7 +41,6 @@ values:
           - definition: '{"ha-mode": "all"}'
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       users: {}
       vhosts:

diff --git a/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml b/test/integration/nopillars/files/_mapdata/arch-base-latest.yaml
@@ -27,7 +27,9 @@ values:
     rabbit:
       clustered: false
       config: {}
-      erlang_cookie: ''
+      distport: 25672
+      erlang_cookie: shared-secret
+      nodeport: 5672
       plugins:
         - rabbitmq_management
         - rabbitmq_federation
@@ -39,7 +41,6 @@ values:
           - definition: '{"ha-mode": "all"}'
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       users: {}
       vhosts:

diff --git a/test/integration/nopillars/files/_mapdata/centos-7.yaml b/test/integration/nopillars/files/_mapdata/centos-7.yaml
@@ -27,7 +27,9 @@ values:
     rabbit:
       clustered: false
       config: {}
-      erlang_cookie: ''
+      distport: 25672
+      erlang_cookie: shared-secret
+      nodeport: 5672
       plugins:
         - rabbitmq_management
         - rabbitmq_federation
@@ -39,7 +41,6 @@ values:
           - definition: '{"ha-mode": "all"}'
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       users: {}
       vhosts:

diff --git a/test/integration/nopillars/files/_mapdata/centos-8.yaml b/test/integration/nopillars/files/_mapdata/centos-8.yaml
@@ -27,7 +27,9 @@ values:
     rabbit:
       clustered: false
       config: {}
-      erlang_cookie: ''
+      distport: 25672
+      erlang_cookie: shared-secret
+      nodeport: 5672
       plugins:
         - rabbitmq_management
         - rabbitmq_federation
@@ -39,7 +41,6 @@ values:
           - definition: '{"ha-mode": "all"}'
       queues: {}
       remove_guest_user: true
-      runas: rabbitmq
       service: true
       users: {}
       vhosts: