diff options
| author | Alex Auvolat <alex@adnab.me> | 2020-05-21 15:27:09 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2020-07-15 16:03:33 +0200 |
| commit | a4f9aa2d9830e9fdc3504a6d2842359ee4ab38f0 (patch) | |
| tree | 3be24e19f8b7a88f36d49870b13f220a178b8f9f /ansible/roles/consul/templates | |
| parent | 1a16fc7f9e54760cc09f676f0176b71654e32117 (diff) | |
| download | infrastructure-a4f9aa2d9830e9fdc3504a6d2842359ee4ab38f0.tar.gz infrastructure-a4f9aa2d9830e9fdc3504a6d2842359ee4ab38f0.zip | |
Set up wireguard in dev cluster
Diffstat (limited to 'ansible/roles/consul/templates')
| -rw-r--r-- | ansible/roles/consul/templates/consul.json.j2 | 6 | ||||
| -rw-r--r-- | ansible/roles/consul/templates/resolv.conf.j2 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/consul/templates/consul.json.j2 b/ansible/roles/consul/templates/consul.json.j2 index b6c86aa..4a36dc2 100644 --- a/ansible/roles/consul/templates/consul.json.j2 +++ b/ansible/roles/consul/templates/consul.json.j2 @@ -1,14 +1,14 @@ { "data_dir": "/var/lib/consul", "bind_addr": "0.0.0.0", - "advertise_addr": "{{ public_ip }}", + "advertise_addr": "{{ vpn_ip }}", "addresses": { "dns": "0.0.0.0", "http": "0.0.0.0" }, "retry_join": [ - {% for selected_host in groups['cluster_nodes']|reject("sameas", ansible_fqdn) %}{# @FIXME: Reject doesn't work #} - "{{ hostvars[selected_host]['private_ip'] }}" {{ "," if not loop.last else "" }} + {% for selected_host in groups['cluster_nodes']|difference([inventory_hostname]) %}{# @FIXME: Reject doesn't work #} + "{{ hostvars[selected_host]['vpn_ip'] }}" {{ "," if not loop.last else "" }} {% endfor %} ], "bootstrap_expect": 3, diff --git a/ansible/roles/consul/templates/resolv.conf.j2 b/ansible/roles/consul/templates/resolv.conf.j2 index 2404034..4da20b9 100644 --- a/ansible/roles/consul/templates/resolv.conf.j2 +++ b/ansible/roles/consul/templates/resolv.conf.j2 @@ -1,2 +1,2 @@ -nameserver {{ private_ip }} +nameserver {{ vpn_ip }} nameserver {{ dns_server }} |