fix: revert to using is mapping in Jinja2

* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
  `'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
This commit is contained in:
Dafydd Jones
2021-03-02 00:40:07 +00:00
parent 6dbba14a29
commit a89fb3f4aa
52 changed files with 349 additions and 12 deletions
+7
View File
@@ -11,6 +11,13 @@ salt:
pillar_roots:
base:
- /srv/pillar
ext_pillar:
- cmd_yaml: cat /etc/salt/yaml
- stack:
- /path/to/stack1.cfg
- /path/to/stack2.cfg
- reclass:
inventory_base_uri: /etc/reclass
minion:
master: localhost
fileserver_backend: