Fighting Jinja syntax

uyuni-project · Oct 4, 2024 · 1e3dda0 · 1e3dda0
1 parent e9d5cbe
commit 1e3dda0
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/salt/repos/clienttools.sls b/salt/repos/clienttools.sls
@@ -410,24 +410,24 @@ tools_update_repo:
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de", true) + '/ibs/Devel:/Galaxy:/Manager:/4.3:/Ubuntu' + release + '-SUSE-Manager-Tools/xUbuntu_' + release %}
 {% elif '4.3-released' in grains.get('product_version') | default('', true) %}
 {# TODO: remove extra code when Ubuntu 24.04 tools get released #}
-{% if release == '24.04' -%}
+{%- if release == '24.04' %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de", true) + '/ibs/Devel:/Galaxy:/Manager:/5.0:/Ubuntu24.04-SUSE-Manager-Tools/xUbuntu_24.04' %}
 {# 5.0 is intentional here (shared tools) #}
-{% else -%}
+{%- else %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Ubuntu/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
-{% endif -%}
+{%- endif %}
 {# END TODO #}
 {% elif '4.3-VM-released' in grains.get('product_version') | default('', true) %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Ubuntu/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
 {% elif '5.0-nightly' in grains.get('product_version') | default('', true) %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de", true) + '/ibs/Devel:/Galaxy:/Manager:/5.0:/Ubuntu' + release + '-SUSE-Manager-Tools/xUbuntu_' + release %}
 {% elif '5.0-released' in grains.get('product_version') | default('', true) %}
 {# TODO: remove extra code when Ubuntu 24.04 tools get released #}
-{% if release == '24.04' -%}
+{%- if release == '24.04' %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de", true) + '/ibs/Devel:/Galaxy:/Manager:/5.0:/Ubuntu24.04-SUSE-Manager-Tools/xUbuntu_24.04' %}
-{% else -%}
+{%- else %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.suse.de/ibs", true) + '/SUSE/Updates/Ubuntu/' + release + '-CLIENT-TOOLS/x86_64/update/' %}
-{% endif -%}
+{%- endif %}
 {# END TODO #}
 {% elif 'uyuni-master' in grains.get('product_version') | default('', true) %}
 {% set tools_repo_url = 'http://' + grains.get("mirror") | default("download.opensuse.org", true) + '/repositories/systemsmanagement:/Uyuni:/Master:/Ubuntu' + short_release + '-Uyuni-Client-Tools/xUbuntu_' + release %}
@@ -455,12 +455,12 @@ tools_update_repo_raised_priority:
     - contents: |
             Package: *
 {# TODO: remove extra code when Ubuntu 24.04 tools get released #}
-{% if release == '24.04' -%}
+{%- if release == '24.04' %}
             Pin: release l=Devel:Galaxy:Manager:5.0:Ubuntu24.04-SUSE-Manager-Tools
 {# 5.0 is intentional here (shared tools) #}
-{% else -%}
+{%- else %}
             Pin: release l=SUSE:Updates:Ubuntu:{{ release }}-CLIENT-TOOLS:x86_64:update
-{% endif -%}
+{%- endif %}
 {# END TODO #}
             Pin-Priority: 800
 {% elif '4.3-VM-released' in grains.get('product_version') | default('', true) %}
@@ -477,11 +477,11 @@ tools_update_repo_raised_priority:
     - contents: |
             Package: *
 {# TODO: remove extra code when Ubuntu 24.04 tools get released #}
-{% if release == '24.04' -%}
+{%- if release == '24.04' %}
             Pin: release l=Devel:Galaxy:Manager:5.0:Ubuntu24.04-SUSE-Manager-Tools
-{% else -%}
+{%- else %}
             Pin: release l=SUSE:Updates:Ubuntu:{{ release }}-CLIENT-TOOLS:x86_64:update
-{% endif -%}
+{%- endif %}
 {# END TODO #}
             Pin-Priority: 800
 {% elif 'uyuni-master' in grains.get('product_version') | default('', true) %}