From ca231fc85f0a739e2c8bf4e4b6740321871237db Mon Sep 17 00:00:00 2001 From: Alexander Graul Date: Thu, 22 Jun 2023 16:05:55 +0200 Subject: [PATCH] Don't install products on openSUSE client OSes openSUSE repos often contain multiple "product packages", that conflict. The idea is that installer installs the correct product once and that's it. In Uyuni, we currently install all products we can find. That does not work because of the conflict. --- susemanager-utils/susemanager-sls/salt/channels/init.sls | 2 +- susemanager-utils/susemanager-sls/susemanager-sls.changes | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/susemanager-utils/susemanager-sls/salt/channels/init.sls b/susemanager-utils/susemanager-sls/salt/channels/init.sls index 5a70365c5cb2..1a3f7a18c22b 100644 --- a/susemanager-utils/susemanager-sls/salt/channels/init.sls +++ b/susemanager-utils/susemanager-sls/salt/channels/init.sls @@ -145,7 +145,7 @@ install_gnupg_debian: {%- endif %} {%- if not salt['pillar.get']('susemanager:distupgrade:dryrun', False) %} -{%- if grains['os_family'] == 'Suse' and grains['osmajorrelease']|int > 11 and not grains['oscodename'] == 'openSUSE Leap 15.3' %} +{%- if grains['os_family'] == 'Suse' and grains['osmajorrelease']|int > 11 and "opensuse" not in grains['oscodename']|lower %} mgrchannels_install_products: product.all_installed: - require: diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes b/susemanager-utils/susemanager-sls/susemanager-sls.changes index 5b0561f2a7f6..33dffe354081 100644 --- a/susemanager-utils/susemanager-sls/susemanager-sls.changes +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes @@ -1,3 +1,4 @@ +- Don't install product packages on openSUSE clients - Prevent product installation from being executed before executing product migration (bsc#1210475) - Include automatic migration from Salt 3000 to Salt Bundle in highstate - fix duplicate packages in state