port fix for missing hosts from upgrade_to_20.04 to main

python · Jul 7, 2022 · 9dab6dd · 9dab6dd
1 parent 1357366
commit 9dab6dd
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/salt/consul/etc/join.json.jinja b/salt/consul/etc/join.json.jinja
@@ -1,12 +1,15 @@
+{% set join_addresses = [] -%}
+{% for server in pillar["consul"]["bootstrap"][pillar["dc"]] -%}
+  {% for name, addresses in salt["mine.get"](server, "psf_internal").items()|sort() -%}
+    {% for address in addresses -%}
+      {% do join_addresses.append(address) -%}
+    {% endfor -%}
+  {% endfor -%}
+{% endfor -%}
 {
     "retry_join": [
-        {% for server in pillar["consul"]["bootstrap"][pillar["dc"]] -%}
-        {%- set sloop = loop -%}
-        {% for name, addresses in salt["mine.get"](server, "psf_internal").items()|sort() -%}
-        {% for address in addresses|sort() -%}
-        "{{ address }}"{% if not sloop.last %},{% endif %}
-        {% endfor -%}
-        {% endfor -%}
+        {% for address in join_addresses|sort() -%}
+        "{{ address }}"{% if not loop.last %},{% endif %}
         {% endfor %}
     ]
 }