From e26039e920618a5db013a52afa4da4458b759a59 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 15 Jan 2023 17:46:16 +0100 Subject: [PATCH] Re-order minion profile Signed-off-by: Georg Pfuetzenreuter --- pillar/role/salt/minion.sls | 1 + salt/profile/salt/minion.sls | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pillar/role/salt/minion.sls b/pillar/role/salt/minion.sls index 291ebda..0a62e50 100644 --- a/pillar/role/salt/minion.sls +++ b/pillar/role/salt/minion.sls @@ -1,4 +1,5 @@ salt: + clean_config_d_dir: False minion_remove_config: True minion: master_type: str diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls index 32fb272..f55bb97 100644 --- a/salt/profile/salt/minion.sls +++ b/salt/profile/salt/minion.sls @@ -1,7 +1,3 @@ -include: - - salt.minion - - .grains - /etc/salt/minion.d/master.conf: file.managed: - contents: @@ -10,3 +6,7 @@ include: - service: salt-minion - watch_in: - service: salt-minion + +include: + - .grains + - salt.minion