summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-15 13:13:11 +0100
committerGeorg Pfuetzenreuter2023-01-15 13:13:11 +0100
commitf693159270e155c7413e3b30d6e90be09ad92d58 (patch)
treeb79f3f9168df22eb9765b2e4cbf1a83fd69d82c1
parentba563b6bb18c7a4eaf69fa1578c18ce882b5abb1 (diff)
downloadsalt-f693159270e155c7413e3b30d6e90be09ad92d58.tar.gz
salt-f693159270e155c7413e3b30d6e90be09ad92d58.tar.bz2
salt-f693159270e155c7413e3b30d6e90be09ad92d58.zip
Refactor common tree
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r--salt/common.sls3
-rw-r--r--salt/common/init.sls3
-rw-r--r--salt/common/suse.sls (renamed from salt/role/common-suse.sls)0
3 files changed, 3 insertions, 3 deletions
diff --git a/salt/common.sls b/salt/common.sls
deleted file mode 100644
index d0d4de2..0000000
--- a/salt/common.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-include:
- - role.minion
- - role.common-suse
diff --git a/salt/common/init.sls b/salt/common/init.sls
new file mode 100644
index 0000000..7fbb4f4
--- /dev/null
+++ b/salt/common/init.sls
@@ -0,0 +1,3 @@
+include:
+ - role.minion
+ - common.{{ grains['os'] | lower }}
diff --git a/salt/role/common-suse.sls b/salt/common/suse.sls
index 0cfce32..0cfce32 100644
--- a/salt/role/common-suse.sls
+++ b/salt/common/suse.sls