diff options
| author | Georg Pfuetzenreuter | 2023-01-24 23:03:20 +0100 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-01-24 23:03:20 +0100 |
| commit | 7b9f184c6b0e6164cfc08b5ae4b77970cc001194 (patch) | |
| tree | 0fa58b0f02166f66be58d368f9acafcc84207b4c | |
| parent | 342affc1b8d8a3c6152de27e809a63e6cc86b043 (diff) | |
| download | salt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.tar.gz salt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.tar.bz2 salt-7b9f184c6b0e6164cfc08b5ae4b77970cc001194.zip | |
Revert "Split to OS specific common pillar"
This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69.
| -rw-r--r-- | pillar/common.sls (renamed from pillar/common/init.sls) | 6 | ||||
| -rw-r--r-- | pillar/common/suse.sls | 6 | ||||
| -rw-r--r-- | pillar/postfix.sls (renamed from pillar/common/postfix.sls) | 0 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pillar/common/init.sls b/pillar/common.sls index 7665aa6..d423f73 100644 --- a/pillar/common/init.sls +++ b/pillar/common.sls @@ -1,8 +1,12 @@ include: - role.salt.common - role.salt.minion - - common.{{ grains['os'] | lower }} managed_header_pound: | ### This file is managed via https://git.com.de/LibertaCasa/salt ### Manual changes will be overwritten + +{%- if grains['os'] == 'SUSE' %} +zypper: + refreshdb_force: False +{%- endif %} diff --git a/pillar/common/suse.sls b/pillar/common/suse.sls deleted file mode 100644 index f3456ed..0000000 --- a/pillar/common/suse.sls +++ /dev/null @@ -1,6 +0,0 @@ -include: - - .postfix - -zypper: - refreshdb_force: False - diff --git a/pillar/common/postfix.sls b/pillar/postfix.sls index 15c3d07..15c3d07 100644 --- a/pillar/common/postfix.sls +++ b/pillar/postfix.sls |