Merge pull request #8090 from vzhestkov/fix-certs-include

Remove includesls macro definition and usage as not relevant
uyuni-project · Jan 4, 2024 · 5a77441 · 5a77441
2 parents a1c9a53 + 84c78f3
commit 5a77441
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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:

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
@@ -0,0 +1 @@
+- Remove includesls macro usage as not relevant anymore