From dcebf2c5036b61ec24ab6fceaaa8a126f791f8fd Mon Sep 17 00:00:00 2001 From: vzhestkov Date: Tue, 2 Jan 2024 14:19:28 +0100 Subject: [PATCH 1/2] Drop includesls macro as not needed --- susemanager-utils/susemanager-sls/salt/certs/init.sls | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/susemanager-utils/susemanager-sls/salt/certs/init.sls b/susemanager-utils/susemanager-sls/salt/certs/init.sls index 764d86c1d3eb..f51e02a4e53a 100644 --- a/susemanager-utils/susemanager-sls/salt/certs/init.sls +++ b/susemanager-utils/susemanager-sls/salt/certs/init.sls @@ -2,11 +2,7 @@ mgr_absent_ca_package: pkg.removed: - name: rhn-org-trusted-ssl-cert -{% macro includesls(os_family) -%} -{% include 'certs/{0}.sls'.format(os_family) -%} -{%- endmacro %} -{% set sls = includesls(grains['os_family']|lower) -%} -{{ sls }} +{% include 'certs/{0}.sls'.format(grains['os_family']|lower) %} mgr_proxy_ca_cert_symlink: file.symlink: From 84c78f32d3260c5da957eb5e5ce94c522c9d5864 Mon Sep 17 00:00:00 2001 From: vzhestkov Date: Tue, 2 Jan 2024 15:51:00 +0100 Subject: [PATCH 2/2] Add changelog entry --- .../susemanager-sls.changes.vzhestkov.fix-certs-include | 1 + 1 file changed, 1 insertion(+) create mode 100644 susemanager-utils/susemanager-sls/susemanager-sls.changes.vzhestkov.fix-certs-include diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes.vzhestkov.fix-certs-include b/susemanager-utils/susemanager-sls/susemanager-sls.changes.vzhestkov.fix-certs-include new file mode 100644 index 000000000000..f544c8a2d941 --- /dev/null +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes.vzhestkov.fix-certs-include @@ -0,0 +1 @@ +- Remove includesls macro usage as not relevant anymore