From 7b9f184c6b0e6164cfc08b5ae4b77970cc001194 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 24 Jan 2023 23:03:20 +0100 Subject: [PATCH] Revert "Split to OS specific common pillar" This reverts commit 4863396938c7c638517cbefc3a2773c9eb29bc69. --- pillar/{common/init.sls => common.sls} | 6 +++++- pillar/common/suse.sls | 6 ------ pillar/{common => }/postfix.sls | 0 3 files changed, 5 insertions(+), 7 deletions(-) rename pillar/{common/init.sls => common.sls} (69%) delete mode 100644 pillar/common/suse.sls rename pillar/{common => }/postfix.sls (100%) diff --git a/pillar/common/init.sls b/pillar/common.sls similarity index 69% rename from pillar/common/init.sls rename to 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 similarity index 100% rename from pillar/common/postfix.sls rename to pillar/postfix.sls