Merge pull request #146 from cityofships/route_options

Fix regression in rendering RHEL route options
michaelrigart · Jul 25, 2023 · d808606 · d808606
2 parents 9ed7492 + 52ea16f
commit d808606
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/templates/route6_RedHat.j2 b/templates/route6_RedHat.j2
@@ -11,12 +11,11 @@
 {% if 'table' in i %}
 {% set route = route ~ ' table ' ~ i.table %}
 {% endif %}
+{{ route -}}
 {% for option in i.options | default([]) %}
-{%   if option is mapping %}
-{%     set option = (option | dict2items | first).key %}
-{%   endif %}
-{%   set route = route ~ ' ' ~ option %}
+{% if option is mapping %}{% set option = (option | dict2items | first).key %}{% endif %}
+ {{ option -}}
 {% endfor %}
-{{ route }}
+
 {% endfor %}
 {% endif %}
diff --git a/templates/route_RedHat.j2 b/templates/route_RedHat.j2
@@ -2,7 +2,7 @@
 
 {% for i in item.route | default([]) %}
 {# Workaround for Ansible bug https://github.com/ansible/ansible/issues/17872. #}
-{% if i is mapping %} {# If route is not a mapping, then assume it's a complete rule #}
+{% if i is mapping %}{# If route is not a mapping, then assume it's a complete rule #}
 {% set prefix = ('0.0.0.0/' ~ i.netmask) | ipaddr('prefix') %}
 {% set route = i.network ~ '/' ~ prefix %}
 {% if 'gateway' in i %}
@@ -13,14 +13,14 @@
 {% if 'table' in i %}
 {% set route = route ~ ' table ' ~ i.table %}
 {% endif %}
+{{ route -}}
 {% for option in i.options | default([]) %}
-{%   if option is mapping %}
-{%     set option = (option | dict2items | first).key %}
-{%   endif %}
-{%   set route = route ~ ' ' ~ option %}
+{% if option is mapping %}{% set option = (option | dict2items | first).key %}{% endif %}
+ {{ option -}}
 {% endfor %}
+
 {% else %}
 {% set route = i %}
-{% endif %}
 {{ route }}
+{% endif %}
 {% endfor %}