salt: Add the grains_cache option to Salt minions Force the sync of…

… the custom set grains. Relates to saltstack/salt#54331
scality · Apr 15, 2024 · 3d55242 · 3d55242
1 parent b58f98b
commit 3d55242
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/salt/metalk8s/node/grains.sls b/salt/metalk8s/node/grains.sls
@@ -16,6 +16,8 @@ Set control_plane_ip grain:
   grains.present:
     - name: metalk8s:control_plane_ip
     - value: {{ control_plane_ip }}
+    - onchanges_in:
+      - module: Force sync of planes grains
 
 {%- else %}
 
@@ -35,10 +37,21 @@ Set workload_plane_ip grain:
   grains.present:
     - name: metalk8s:workload_plane_ip
     - value: {{ workload_plane_ip }}
+    - onchanges_in:
+      - module: Force sync of planes grains
 
 {%- else %}
 
 No workload-plane network interface present on the host:
   test.fail_without_changes
 
 {%- endif %}
+
+{%- if control_plane_ip or workload_plane_ip %}
+
+{#- Since we enable grains cache, the cache is not refreshed automatically #}
+Force sync of planes grains:
+  module.run:
+    - saltutil.sync_grains: []
+
+{%- endif %}
diff --git a/salt/metalk8s/node/rocky-linux-grains.sls b/salt/metalk8s/node/rocky-linux-grains.sls
@@ -26,3 +26,4 @@ Not a Rocky Linux host, no os grain to set:
   test.nop
 
 {%- endif %}
+
diff --git a/salt/metalk8s/salt/minion/files/minion-99-metalk8s.conf.j2 b/salt/metalk8s/salt/minion/files/minion-99-metalk8s.conf.j2
@@ -4,6 +4,8 @@ id: {{ minion_id }}
 retry_dns_count: 5
 enable_fqdns_grains: false
 
+grains_cache: true
+
 # use new module.run format
 use_superseded:
   - module.run

diff --git a/salt/metalk8s/salt/minion/local.sls b/salt/metalk8s/salt/minion/local.sls
@@ -29,3 +29,4 @@ Configure salt minion for local mode:
           - metalk8s: /etc/metalk8s/bootstrap.yaml
         retry_dns_count: 3
         enable_fqdns_grains: false
+        grains_cache: true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ Not a Rocky Linux host, no os grain to set:
		test.nop

		{%- endif %}