From 1efab3d95f5618cdaa0e746e704ebbdc1e791870 Mon Sep 17 00:00:00 2001 From: Oscar Barrios Date: Tue, 22 Oct 2024 12:55:37 +0200 Subject: [PATCH] Don't trigger repos salt states for transactional server (#1740) --- salt/repos/init.sls | 6 +----- salt/server/init.sls | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/salt/repos/init.sls b/salt/repos/init.sls index fd2081b50..58cc37f60 100644 --- 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 index 51fd9386e..aa93a50d1 100644 --- 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: