From f693159270e155c7413e3b30d6e90be09ad92d58 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 15 Jan 2023 13:13:11 +0100 Subject: Refactor common tree Signed-off-by: Georg Pfuetzenreuter --- salt/common.sls | 3 --- salt/common/init.sls | 3 +++ salt/common/suse.sls | 4 ++++ salt/role/common-suse.sls | 4 ---- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 salt/common.sls create mode 100644 salt/common/init.sls create mode 100644 salt/common/suse.sls delete mode 100644 salt/role/common-suse.sls 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/common/suse.sls b/salt/common/suse.sls new file mode 100644 index 0000000..0cfce32 --- /dev/null +++ b/salt/common/suse.sls @@ -0,0 +1,4 @@ +include: + - profile.seccheck + - profile.zypp + - profile.node_exporter diff --git a/salt/role/common-suse.sls b/salt/role/common-suse.sls deleted file mode 100644 index 0cfce32..0000000 --- a/salt/role/common-suse.sls +++ /dev/null @@ -1,4 +0,0 @@ -include: - - profile.seccheck - - profile.zypp - - profile.node_exporter -- cgit v1.2.3