Merge branch 'devel' of github.com:brianshumate/ansible-consul into devel

Author: brianshumate

README.md

@@ -186,6 +186,11 @@ Many role variables can also take their values from environment variables as wel
 - Interval for reconnection attempts to WAN servers
 - Default value: 30s
 
+### `consul_retry_join_skip_hosts`
+
+- If true, the config value for retry_join won't be populated by the default hosts servers. The value can be initialized using consul_join
+- Default value: false
+
 ### `consul_retry_max`
 
 - Max reconnection attempts to LAN servers before failing (0 = infinite)

defaults/main.yml

@@ -82,6 +82,7 @@ consul_raft_protocol: "\
   {% else %}\
     3\
   {% endif %}"
+consul_retry_join_skip_hosts: false
 consul_retry_interval: "30s"
 consul_retry_interval_wan: "30s"
 consul_retry_max: 0

templates/config.json.j2

@@ -83,9 +83,11 @@
     "retry_max": {{ consul_retry_max | int }},
 
     "retry_join":
-    {% for server in _consul_lan_servers %}
-    {%   set _ = consul_join.append(hostvars[server]['consul_advertise_address'] | default(hostvars[server]['consul_bind_address'])) %}
-    {% endfor %}
+    {% if not consul_retry_join_skip_hosts %}
+      {% for server in _consul_lan_servers %}
+      {%   set _ = consul_join.append(hostvars[server]['consul_advertise_address'] | default(hostvars[server]['consul_bind_address'])) %}
+      {% endfor %}
+    {% endif %}
     {{ consul_join | map('ipwrap') | list | to_json }},
 
     {## Server/Client ##}

tests/test_vars.yml

@@ -89,6 +89,7 @@ consul_raft_protocol: "\
   {% else %}\
     3\
   {% endif %}"
+consul_retry_join_skip_hosts: false
 consul_retry_interval: "30s"
 consul_retry_interval_wan: "30s"
 consul_retry_max: 0