From f693159270e155c7413e3b30d6e90be09ad92d58 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 15 Jan 2023 13:13:11 +0100 Subject: [PATCH] Refactor common tree Signed-off-by: Georg Pfuetzenreuter --- salt/common.sls | 3 --- salt/common/init.sls | 3 +++ salt/{role/common-suse.sls => common/suse.sls} | 0 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 salt/common.sls create mode 100644 salt/common/init.sls rename salt/{role/common-suse.sls => common/suse.sls} (100%) 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 similarity index 100% rename from salt/role/common-suse.sls rename to salt/common/suse.sls