From 56a1e11ef6a7f73edab543d79f6eba8b940d699f Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Thu, 26 Jan 2023 19:30:15 +0100 Subject: Move common to global pillar Signed-off-by: Georg Pfuetzenreuter --- pillar/common.sls | 13 ------------- pillar/global/init.sls | 13 +++++++++++++ pillar/top.sls | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 pillar/common.sls create mode 100644 pillar/global/init.sls (limited to 'pillar') diff --git a/pillar/common.sls b/pillar/common.sls deleted file mode 100644 index 280886f..0000000 --- a/pillar/common.sls +++ /dev/null @@ -1,13 +0,0 @@ -include: - - role.salt.common - - role.salt.minion - - role.mta.postfix - -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/global/init.sls b/pillar/global/init.sls new file mode 100644 index 0000000..280886f --- /dev/null +++ b/pillar/global/init.sls @@ -0,0 +1,13 @@ +include: + - role.salt.common + - role.salt.minion + - role.mta.postfix + +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/top.sls b/pillar/top.sls index ac21037..8aa06e7 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -3,7 +3,7 @@ {{ saltenv }}: '*': - - common + - global 'id:{{ id }}': - match: grain - ignore_missing: True -- cgit v1.2.3