Correctly switch to Salt Bundle on transactional systems

uyuni-project · Feb 20, 2025 · aa7da72 · aa7da72
1 parent d178cdd
commit aa7da72
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/susemanager-utils/susemanager-sls/salt/util/mgr_switch_to_venv_minion.sls b/susemanager-utils/susemanager-sls/salt/util/mgr_switch_to_venv_minion.sls
@@ -56,20 +56,37 @@ mgr_copy_salt_minion_keys:
     - unless:
       - test -f /etc/venv-salt-minion/pki/minion/minion_master.pub
 
+{%- if grains['transactional']==True %}
+mgr_enable_venv_salt_minion:
+    cmd.run:
+    - name: systemctl enable venv-salt-minion
+    - require:
+      - cmd: mgr_copy_salt_minion_keys
+{%- else %}
 mgr_enable_venv_salt_minion:
   service.running:
     - name: venv-salt-minion
     - enable: True
     - require:
       - cmd: mgr_copy_salt_minion_keys
+{%- endif %}
 
+{%- if grains['transactional']==True %}
+mgr_disable_salt_minion:
+    cmd.run:
+    - name: systemctl disable salt-minion
+    - require:
+      - service: mgr_enable_venv_salt_minion
+      - sls: services.salt-minion
+{%- else %}
 mgr_disable_salt_minion:
   service.dead:
     - name: salt-minion
     - enable: False
     - require:
       - service: mgr_enable_venv_salt_minion
       - sls: services.salt-minion
+{%- endif %}
 
 {%- if salt['pillar.get']('mgr_purge_non_venv_salt') %}
 mgr_purge_non_venv_salt_packages:

diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes.joyetamdk.bsc1232562 b/susemanager-utils/susemanager-sls/susemanager-sls.changes.joyetamdk.bsc1232562
@@ -0,0 +1,2 @@
+- Correctly switch to Salt Bundle on transactional systems 
+  (bsc#1232562)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Correctly switch to Salt Bundle on transactional systems
Check failure on line 1 in susemanager-utils/susemanager-sls/susemanager-sls.changes.joyetamdk.bsc1232562 View workflow job for this annotation GitHub Actions / Changelog tests `Trailing whitespaces in file susemanager-utils/susemanager-sls/susemanager-sls.changes.joyetamdk.bsc1232562#L1`
		(bsc#1232562)