From fe2a1a21b9931818807613ca43342719100e78d8 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Sun, 15 Jan 2023 17:06:29 +0100
Subject: Use traditional grains management
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
salt/profile/salt/grains.sls | 11 ++++-------
salt/profile/salt/minion.sls | 3 +++
2 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 salt/profile/salt/minion.sls
(limited to 'salt/profile')
diff --git a/salt/profile/salt/grains.sls b/salt/profile/salt/grains.sls
index 1926250..632a8bc 100644
--- a/salt/profile/salt/grains.sls
+++ b/salt/profile/salt/grains.sls
@@ -6,10 +6,7 @@ salt_grains_file:
- names:
- /etc/salt/grains:
- source: salt:///{{ slspath }}/files/etc/salt/grains.j2
-
-salt_restart_minion:
- cmd.run:
- - name: 'salt-call service.restart salt-minion'
- - bg: True
- - onchanges:
- - file: salt_grains_file
+ - require_in:
+ - service: salt-minion
+ - watch_in:
+ - service: salt-minion
diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls
new file mode 100644
index 0000000..6978eaf
--- /dev/null
+++ b/salt/profile/salt/minion.sls
@@ -0,0 +1,3 @@
+include:
+ - salt.minion
+ - .grains
--
cgit v1.2.3