Commit 33ddb9cb authored by HgO's avatar HgO
Browse files

Merge branch '158-migration-vers-debian-bullseye' into 'main'

Resolve "Migration vers debian bullseye"

Closes #158

See merge request Neutrinet/infra!186
parents dd0a644c 8331912f
Pipeline #803 passed with stage
in 3 minutes and 44 seconds
......@@ -26,12 +26,12 @@
[hetzner]
mail.htz.neutri.net
pbs-01.htz.neutri.net
probe-02.htz.neutri.net
[firstheberg]
probe-01.first.neutri.net
[ovhcloud]
probe-02.ovh.neutri.net
storage-01.ovh.neutri.net
[louise:children]
......@@ -71,7 +71,6 @@ hedgedoc.patata.louise.neutri.net
mattermost.patata.louise.neutri.net
grav.patata.louise.neutri.net
backoffice.patata.louise.neutri.net
radius-01.patata.louise.neutri.net
librenms.patata.louise.neutri.net
## Proxmox
......@@ -97,13 +96,24 @@ nextcloud.patata.louise.neutri.net
[haproxy:children]
haproxy_keepalived
haproxy_prometheus
prometheus_haproxy
[keepalived:children]
haproxy_keepalived
[haproxy_keepalived]
haproxy-01.patata.louise.neutri.net
haproxy-02.patata.louise.neutri.net
[haproxy_prometheus]
[prometheus]
probe-01.first.neutri.net
probe-02.htz.neutri.net
man.patata.louise.neutri.net
[prometheus:children]
prometheus_haproxy
[prometheus_haproxy]
storage-01.ovh.neutri.net
[web_static]
......@@ -140,7 +150,7 @@ backoffice.patata.louise.neutri.net
[nftables]
mail.htz.neutri.net
probe-01.first.neutri.net
probe-02.ovh.neutri.net
probe-02.htz.neutri.net
edge-01.louise.neutri.net
edge-02.louise.neutri.net
storage-01.ovh.neutri.net
......@@ -154,13 +164,7 @@ ansible_python_interpreter=/usr/local/bin/python3.7
[probe]
probe-01.first.neutri.net
probe-02.ovh.neutri.net
storage-01.ovh.neutri.net
[prometheus]
probe-01.first.neutri.net
probe-02.ovh.neutri.net
man.patata.louise.neutri.net
probe-02.htz.neutri.net
storage-01.ovh.neutri.net
[alertmanager]
......
deb http://deb.debian.org/debian/ {{ ansible_distribution_release }} main contrib non-free
deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-updates main contrib non-free
deb http://deb.debian.org/debian/ {{ ansible_distribution_release }}-backports main contrib non-free
{% if ansible_distribution_release == 'bullseye' %}
{% if ansible_distribution_major_version is version(11, '>=') %}
deb http://security.debian.org/debian-security {{ ansible_distribution_release }}-security main contrib non-free
{% else %}
deb http://security.debian.org/ {{ ansible_distribution_release }}/updates main contrib non-free
......
......@@ -20,6 +20,8 @@ vrrp_instance VI_{{ instance.type }} {
priority 100
advert_int 1
unicast_src_ip {{ lookup('vars', 'ansible_default_' + instance.type).address }}
unicast_peer {
{% for ip in instance.addresses if ip not in lookup('vars', 'ansible_all_' + instance.type + '_addresses') %}
{{ ip }}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment