summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-15 17:46:16 +0100
committerGeorg Pfuetzenreuter2023-01-15 17:51:44 +0100
commite26039e920618a5db013a52afa4da4458b759a59 (patch)
tree605c4ff1917dc2cdd5df080470685a2ac2a85dcb
parent546508c7dec218f91edb0c5416716d21a16363a0 (diff)
downloadsalt-e26039e920618a5db013a52afa4da4458b759a59.tar.gz
salt-e26039e920618a5db013a52afa4da4458b759a59.tar.bz2
salt-e26039e920618a5db013a52afa4da4458b759a59.zip
Re-order minion profile
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
-rw-r--r--pillar/role/salt/minion.sls1
-rw-r--r--salt/profile/salt/minion.sls8
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