Don't trigger repos salt states for transactional server (#1740)

uyuni-project · Oct 22, 2024 · 1efab3d · 1efab3d
1 parent 5c59e92
commit 1efab3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/salt/repos/init.sls b/salt/repos/init.sls
@@ -21,15 +21,11 @@ include:
   {% endif %}
   - repos.additional
 
-{% if grains['os'] == 'SUSE' %}
+{% if grains['os'] == 'SUSE' and grains['osfullname'] not in ['SLE Micro', 'SL-Micro'] %}
 refresh_repos:
   cmd.run:
-{% if grains['osfullname'] in ['SLE Micro', 'SL-Micro'] %}
-    - name: transactional-update -c run zypper --non-interactive --gpg-auto-import-keys refresh --force
-{% else %}
     - name: zypper --non-interactive --gpg-auto-import-keys refresh --force; exit 0
 {% endif %}
-{% endif %}
 
 # WORKAROUND: see github:saltstack/salt#10852
 {{ sls }}_nop:

diff --git a/salt/server/init.sls b/salt/server/init.sls
@@ -1,6 +1,6 @@
 include:
   - scc.server
-  {% if 'build_image' not in grains.get('product_version', '') and 'paygo' not in grains.get('product_version', '') %}
+  {% if 'build_image' not in grains.get('product_version', '') and 'paygo' not in grains.get('product_version', '') and grains['osfullname'] not in ['SLE Micro', 'SL-Micro'] %}
   - repos
   {% endif %}
   - server.additional_disk
@@ -20,7 +20,6 @@ include:
   - server.salt_master
   - server.tcpdump
 
-
 {% if 'paygo' not in grains.get('product_version') | default('', true) %}
 {% if 'uyuni' not in grains.get('product_version') %}
 server-switch-product: