fix(salt-ssh): jinja include is unusable in file.managed templates

Caching the jinja include with a `file.cached` workaround the issue as explained on the tracker: saltstack/salt#21370 (comment)
eole · Dec 21, 2022 · cdcd4be · cdcd4be
1 parent 56d55fb
commit cdcd4be
Show file tree

Hide file tree

Showing 47 changed files with 148 additions and 0 deletions.
diff --git a/collectd/apache.sls b/collectd/apache.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/apache.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/bind.sls b/collectd/bind.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/bind.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/csv.sls b/collectd/csv.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/csv.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/curl_json.sls b/collectd/curl_json.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/curl_json.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/curl_xml.sls b/collectd/curl_xml.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/curl_xml.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/dbi.sls b/collectd/dbi.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/dbi.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/df.sls b/collectd/df.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/df.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/disk.sls b/collectd/disk.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/disk.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/elasticsearch.sls b/collectd/elasticsearch.sls
@@ -3,6 +3,7 @@
 include:
   - collectd
   - collectd.python
+  - collectd.workaround-salt-ssh
 
 collectd-elasticsearch-module:
   pip.installed:
@@ -20,5 +21,7 @@ collectd-elasticsearch-module:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/ethstat.sls b/collectd/ethstat.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/ethstat.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/exec.sls b/collectd/exec.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/exec.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/extra-plugins.sls b/collectd/extra-plugins.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {%- for plugin, plugin_settings in collectd_settings.plugins.extra.items() %}
 {{ collectd_settings.plugindirconfig }}/{{ plugin }}.conf:
@@ -14,6 +15,8 @@ include:
     - defaults:
         plugin: {{ plugin }}
         plugin_settings: {{ plugin_settings }}
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
 {% endfor %}
diff --git a/collectd/init.sls b/collectd/init.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd.service
+  - collectd.workaround-salt-ssh
 
 collectd:
   pkg.installed:
@@ -28,6 +29,8 @@ collectd:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
 
@@ -38,5 +41,7 @@ collectd:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/interface.sls b/collectd/interface.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/interface.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/java.sls b/collectd/java.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 collectd-java:
     file.rename:
@@ -24,5 +25,7 @@ collectd-java:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/librato.sls b/collectd/librato.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/librato.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/logfile.sls b/collectd/logfile.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/logfile.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/md.sls b/collectd/md.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/md.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/memcached.sls b/collectd/memcached.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/memcached.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/mysql.sls b/collectd/mysql.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/mysql.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 600
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/network.sls b/collectd/network.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/network.conf:
   file.managed:
@@ -10,6 +11,8 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: '0600'
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
 

diff --git a/collectd/nginx.sls b/collectd/nginx.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/nginx.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/ntpd.sls b/collectd/ntpd.sls
@@ -3,6 +3,7 @@
 include:
   - collectd
   - collectd.python
+  - collectd.workaround-salt-ssh
 
 collectd-ntp-module:
   pip.installed:
@@ -19,5 +20,7 @@ collectd-ntp-module:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service
diff --git a/collectd/openldap.sls b/collectd/openldap.sls
@@ -2,6 +2,7 @@
 
 include:
   - collectd
+  - collectd.workaround-salt-ssh
 
 {{ collectd_settings.plugindirconfig }}/openldap.conf:
   file.managed:
@@ -10,5 +11,7 @@ include:
     - group: {{ collectd_settings.group }}
     - mode: 644
     - template: jinja
+    - require:
+      - sls: collectd.workaround-salt-ssh
     - watch_in:
       - service: collectd-service