Revert "Split to OS specific common pillar"

This reverts commit 4863396938.
2023-01-24 23:03:20 +01:00 · 2023-01-24 23:03:20 +01:00 · 7b9f184c6b
commit 7b9f184c6b
parent 342affc1b8
3 changed files with 5 additions and 7 deletions
--- a/pillar/common/init.sls
+++ b/pillar/common/init.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 %}
--- a/pillar/common/suse.sls
+++ b/pillar/common/suse.sls
@ -1,6 +0,0 @@
-include:
-  - .postfix
-
-zypper:
-  refreshdb_force: False
-
--- a/pillar/common/postfix.sls
+++ b/pillar/common/postfix.sls