From 600ab9fd114fb09d3a97b8adef8bdcadd65fa566 Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Fri, 4 Oct 2024 18:25:11 +0200 Subject: [PATCH] Fighting Jinja syntax --- salt/repos/clienttools.sls | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/salt/repos/clienttools.sls b/salt/repos/clienttools.sls index dd2ee05e0..68fee4363 100644 --- a/salt/repos/clienttools.sls +++ b/salt/repos/clienttools.sls @@ -410,12 +410,12 @@ 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/' %} @@ -423,11 +423,11 @@ tools_update_repo: {% 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) %}