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 index b241bed1671f..4c285f4139db 100644 --- 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,13 +56,29 @@ 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 @@ -70,6 +86,7 @@ mgr_disable_salt_minion: - 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 new file mode 100644 index 000000000000..b181adc10360 --- /dev/null +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes.joyetamdk.bsc1232562 @@ -0,0 +1,2 @@ +- Correctly switch to Salt Bundle on transactional systems + (bsc#1232562)