borgbackups: move variables in playbook

rsyslog: move variables in playbook
2021-11-28 17:27:41 +01:00 · 2021-11-28 17:09:16 +01:00
388 changed files with 3838 additions and 97539 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,3 @@
 *.retry
 tmp
 ldap-password.txt
-__pycache__/
--- a/README.md
+++ b/README.md
@ -1,8 +1,10 @@
+[![Linter Status](https://drone.auro.re/api/badges/Aurore/ansible/status.svg)](https://drone.auro.re/Aurore/ansible)
+
 # Recettes Ansible d'Aurore

 Dépendances requises :

-* Ansible 2.9 ou plus récent.
+ * Ansible 2.9 ou plus récent.

 ## Ansible 101

@ -13,9 +15,8 @@ Il contient la définition de chaque machine et le regroupement.

 Quand on regroupe avec un `:children` en réalité on groupe des groupes.

-Chaque machine est annoncée avec son hostname. Il faut pouvoir SSH sur cette
-machine avec ce hostname, car c'est ce qu'Ansible fera (sauf pour les switchs,
-voir plus bas).
+Chaque machine est annoncée avec son hostname. Il faut pouvoir SSH sur cette machine
+avec ce hostname, car c'est ce qu'Ansible fera.

 **Playbook** : c'est une politique de déploiement.
 Il contient les associations des rôles avec les machines.
@ -36,42 +37,31 @@ déployer un serveur prometheus, déployer une node prometheus…
 **Tâche** : un rôle est composé de tâches. Une tâche effectue une et une seule
 action. Elle est associée à un module Ansible.

-*Exemples de tâche* : installer un paquet avec le module `apt`, ajouter une
-ligne dans un fichier avec le module `lineinfile`, copier une template avec le
-module `template`…
+*Exemples de tâche* : installer un paquet avec le module `apt`, ajouter une ligne dans
+un fichier avec le module `lineinfile`, copier une template avec le module `template`…

-Une tâche peut avoir des paramètres supplémentaires pour la réessayer quand
-elle plante, récupérer son résultat dans une variable, mettre une boucle
-dessus, mettre des conditions…
+Une tâche peut avoir des paramètres supplémentaires pour la réessayer quand elle plante,
+récupérer son résultat dans une varible, mettre une boucle dessus, mettre des conditions…

-N'oubliez pas d'aller lire l'excellente documentation de RedHat sur tous les modules
+N'oubliez pas d'aller lire l'excellent documentation de RedHat sur tous les modules
 d'Ansible !

 ### Gestion des groupes de machines

 Pour la liste complète, je vous invite à lire le fichier `hosts`.

-Exemple :
+  * pour tester les versions de Debian,

-```yaml
-[fleming_vm]
-dhcp-fleming.adm.auro.re
-dns-fleming.adm.auro.re
-prometheus-fleming.adm.auro.re
-routeur-fleming.adm.auro.re
+    ```YAML
+    ansible_lsb.codename == 'stretch'
+    ```

-[fleming_pve]
-pve1.adm.auro.re
+  * pour tester si c'est un CPU Intel x86_64,

-[fleming:children]
-fleming_pve
-fleming_vm
-```
-
-> NB :
->
-> L'exemple a été adapté de la configuration d'Aurore pour des raisons
-> pédagogiques.
+    ```YAML
+    ansible_processor[0].find('Intel') != -1
+    and ansible_architecture == 'x86_64'
+    ```

 Pour les fonctions (`proxy-server`, `dhcp-dynamique`…) il a été choisi
 de ne pas faire de groupe particulier mais plutôt de sélectionner/enlever
@ -84,36 +74,21 @@ qui peuvent ensuite être utilisés dans des variables.
 Pour lister tous les faits qu'Ansible collecte nativement d'un serveur
 on peut exécuter le module `setup` manuellement.

-```bash
+```
 ansible proxy.adm.auro.re -m setup --ask-vault-pass
 ```

-Il est notamment possible de :
-
-* tester les versions de Debian,
-
-  ```YAML
-  ansible_lsb.codename == 'stretch'
-  ```
-
-* tester si c'est un CPU Intel x86_64,
-
-  ```YAML
-  ansible_processor[0].find('Intel') != -1
-  and ansible_architecture == 'x86_64'
-  ```
-
 ## Exécution d'Ansible

 ### Configurer la connexion au vlan adm

 Envoyer son agent SSH peut être dangereux
-([source](https://heipei.github.io/2015/02/26/SSH-Agent-Forwarding-considered-harmful/)).
+([source](https://heipei.io/2015/02/26/SSH-Agent-Forwarding-considered-harmful/)).

 On va utiliser plutôt `ProxyJump`.
 Dans la configuration SSH :

-```text
+```
 Host *.adm.auro.re *.pve.auro.re
    # Accept new host keys
    StrictHostKeyChecking accept-new
@ -122,8 +97,7 @@ Host *.adm.auro.re *.pve.auro.re
    ProxyJump passerelle.auro.re
 ```

-Il faut sa clé SSH configurée sur le serveur que l'on déploie.
-
+Il faut sa clé SSH configurée sur le serveur que l'on déploit.
 ```bash
 ssh-copy-id proxy.adm.auro.re
 ```
@ -133,7 +107,6 @@ ssh-copy-id proxy.adm.auro.re
 Il faut `python3-netaddr` sur sa machine.

 Pour tester le playbook `base.yml` :
-
 ```bash
 ansible-playbook --ask-vault-pass base.yml --check
 ```
@ -143,7 +116,7 @@ Vous pouvez ensuite enlever `--check` si vous voulez appliquer les changements !
 Si vous avez des soucis de fingerprint ECDSA, vous pouvez ignorer une
 première fois (dangereux !) : `ANSIBLE_HOST_KEY_CHECKING=0 ansible-playbook...`.

-### Ajouter toutes les empreintes de serveur
+### Ajouter tous les empruntes de serveur

 ```bash
 #!/bin/bash
@ -152,10 +125,6 @@ for ip in `cat hosts|grep .adm.auro.re`; do
 done
 ```

-> Remarque :
->
-> L'utilisation d'un certificat permet d'éviter d'avoir à ajouter sa clé ssh
-> sur les serveurs.

 ### Passage à Ansible 2.10 (release: 30 juillet)

@ -167,141 +136,11 @@ ansible-galaxy collection install community.general
 ansible-galaxy collection install ansible.posix
 ```

-Si vous n'arrivez pas à entrer votre *become password* (bug dans ansible?), un
+
+Si vous n'arrivez pas à entrer votre _become password_ (bug dans ansible?), un
 workaround est le suivant :

 `$  export ANSIBLE_BECOME_PASS='<votre mot de passe LDAP>'`

 Notez l'espace au début pour ne pas log la commande dans votre historique
 shell.
-
-## Configuration des switchs depuis Ansible
-
-Afin d'acquérir de l'indépendance vis-à-vis de re2o, un module permettant de
-configurer les switchs depuis Ansible a été créé. Il utilise l'api rest des
-switchs afin de récupérer et appliquer la configuration voulue.
-
-### Prérequis
-
-Pour utiliser le module, il faut d'abord annoncer à Ansible qu'il ne faut pas
-effectuer de connexion ssh et de ne pas récupérer les faits. Cela se fait à
-l'aide des variables `connection: httpapi` et `gather_facts: false` à placer
-dans le playbook (pour une configuration locale) ou dans ansible.cfg (pour une
-configuration globale). Ensuite, l'infrastructure actuelle de Aurore nécessite
-l'utilisation d'un proxy. Pour cela, il suffit d'exécuter la commande :
-
-```bash
-ssh -D 3000 switchs-manager.adm.auro.re
-```
-
-et d'annoncer l'utilisation du proxy dans la configuration en exportant la
-variable d'environnement `HTTP_PROXY=socks5://localhost:3000` et en
-configurant la variable du module `use_proxy: true`.
-
-Exemple :
-
-```yaml
-environment:
-  HTTP_PROXY: "socks5://localhost:3000"
-tasks:
-  - name: vlans
-    switch_config:
-      username: ****
-      password: ****
-      port: 80
-      host: 192.168.1.42
-      use_proxy: true
-      config:
-        path: vlans/42
-        data:
-          name: VLAN42
-          vlan_id: 42
-          status: VS_PORT_BASED
-          type: VT_STATIC
-```
-
-Le module est alors utilisable, il ne reste plus qu'à le configurer.
-
-### Écrire la configuration
-
-Le module se veut assez libre. Ainsi, l'ensemble de la requête doit être écrite
-dans les `tasks`. Voici un exemple pour configurer un vlan :
-
-```yaml
-tasks:
-  - name: vlans
-    switch_config:
-      username: ****
-      password: ****
-      port: 80
-      host: 192.168.1.42
-      config:
-        path: vlans/42
-        data:
-          name: VLAN42
-          vlan_id: 42
-          status: VS_PORT_BASED
-          type: VT_STATIC
-```
-
-Le `path` correspond à l'url de l'objet que l'on souhaite éditer et `data`
-correspond aux données qui seront envoyées dans une requête `PUT` (au format
-`json`). Cependant, la configuration d'un vlan peut nécessiter de le créer.
-Pour remédier à ce problème, il est possible d'utiliser la syntaxe suivante :
-
-```yaml
-
-tasks:
-  - name: vlans
-    switch_config:
-      username: ****
-      password: ****
-      port: 80
-      host: 192.168.1.42
-      config:
-        path: vlans
-        create_method: POST
-        subpath:
-          - path: 42
-            data:
-              name: VLAN42
-              vlan_id: 42
-              status: VS_PORT_BASED
-              type: VT_STATIC
-```
-
-Le variable `create_method` correspond au type de la requête pour effectuer une
-action de création de l'objet. Il s'agit généralement de `POST`. Dans le cas
-où la variable n'est pas définit, la création sera désactivée et ainsi, si
-l'url indiquée dans les `subpath` n'existe pas, alors la configuration échouera.
-Par conséquent, si le vlan 42 a besoin d'être créé, une requête `POST` sera
-effectué sur l'url `vlans` avec les données dans `data`.
-
-Il est également possible d'éxecuter une action de suppression d'un vlan à l'aide
-de la variable `delete` :
-
-```yaml
-  tasks:
-    - name: vlans
-      switch_config:
-        username: ****
-        password: ****
-        port: 80
-        host: 192.168.1.42
-        config:
-          path: vlans/42
-          delete: true
-```
-
-Si la variable `delete` est activée, alors une requête `DELETE` sera envoyée
-sur l'url indiquée. Pour vérifier si la suppression est déjà effective avant
-l'éxecution, le module vérifiera si un `GET` sur l'url retourne une 404.
-
-> Remarque :
->
-> Si les variables `delete` et `data` sont définies (dont `delete` à `true`),
-> alors il en résultera une action de suppression malgré tout.
-
-Puisque `subpath` est une liste, il est possible de configurer plusieurs requête
-en même temps. Cela à l'avantage d'effectuer toutes les modifications à la suite
-(sans avoir à se connecter plusieurs sur l'api).
--- a/all.yml
+++ b/all.yml
@ -1,18 +0,0 @@
-#!/usr/bin/env ansible-playbook
---
- import_playbook: playbooks/base.yml
- import_playbook: playbooks/root.yml
- import_playbook: playbooks/ssh.yml
- import_playbook: playbooks/chronyd.yml
- import_playbook: playbooks/kresd.yml
- import_playbook: playbooks/knotd.yml
- import_playbook: playbooks/resolvconf.yml
- import_playbook: playbooks/ifupdown2.yml
- import_playbook: playbooks/systemd_link.yml
- import_playbook: playbooks/keepalived.yml
- import_playbook: playbooks/ip_forward.yml
- import_playbook: playbooks/dhcpd.yml
- import_playbook: playbooks/bird.yml
- import_playbook: playbooks/pve.yml
- import_playbook: playbooks/prometheus.yml
-...
--- a/ansible.cfg
+++ b/ansible.cfg
@ -1,22 +1,41 @@
-[defaults]
-jinja2_native = true
+# Ansible configuration

-ask_vault_pass = True
+[defaults]
+
+# Explicitly redefine some defaults to make subfolder execution work
 roles_path = ./roles
+
+# Do not create .retry files
 retry_files_enabled = False
+
+# Use inventory
 inventory = ./hosts
-stdout_callback = debug
-library = ./library
-filter_plugins = ./filter_plugins
-ansible_managed = Ansible managed
+
+# Custom header in templates
+ansible_managed = Ansible managed, modified on %Y-%m-%d %H:%M:%S by {uid}
+
+# Do not use cows (with cowsay)
 nocows = 1
+
+# Do more parallelism
 forks = 15
+
+# Some SSH connection will take time
 timeout = 60
-remote_user = root
+
+[privilege_escalation]
+
+# Use sudo to get priviledge access
+become = True
+
+# Ask for password
+become_ask_pass = True

 [diff]
+
+# TO know what changed
 always = yes

+
 [ssh_connection]
 pipelining = True
-retries = 3
--- a/copy-keys.sh
+++ b/copy-keys.sh
@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+# Grab valid unique hostnames from the Ansible inventory.
+HOSTS=$(grep -ve '^[#\[]' hosts \
+| grep -F adm.auro.re \
+| sort -u)
+
+# Ask password
+read -s -p "Hello adventurer, what is your LDAP password? " passwd
+echo
+
+for host in $HOSTS; do
+  echo "[+] Handling host $host"
+
+  # sshpass can be used for non-interactive password authentication.
+  # place your password in ldap-password.txt.
+  SSHPASS=${passwd} sshpass -v -e ssh-copy-id "$host"
+done
+
--- a/deploy_all.sh
+++ b/deploy_all.sh
@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Deploy all playbooks
+ansible-playbook playbooks/*.yml $@
--- a/filter_plugins/enquote.py
+++ b/filter_plugins/enquote.py
@ -1,16 +0,0 @@
-class FilterModule:
-    def filters(self):
-        return {
-            "enquote": enquote,
-        }
-
-
-def enquote(string, delimiter='"', escape="\\"):
-    translation = str.maketrans(
-        {
-            delimiter: f"{escape}{delimiter}",
-            escape: f"{escape}{escape}",
-        }
-    )
-    escaped = string.translate(translation)
-    return f"{delimiter}{escaped}{delimiter}"
--- a/filter_plugins/format_rev.py
+++ b/filter_plugins/format_rev.py
@ -1,9 +0,0 @@
-class FilterModule:
-    def filters(self):
-        return {
-            "format_rev": format_rev,
-        }
-
-
-def format_rev(text, fmt, *args, **kwargs):
-    return fmt.format(text, *args, **kwargs)
--- a/filter_plugins/net_utils.py
+++ b/filter_plugins/net_utils.py
@ -1,68 +0,0 @@
-import ipaddress
-from operator import attrgetter
-
-import dns.name
-
-
-class FilterModule:
-    def filters(self):
-        return {
-            "add_origin": add_origin,
-            "add_origin_keys": add_origin_keys,
-            "ip_filter": ip_filter,
-            "remove_domain_suffix": remove_domain_suffix,
-            "ipaddr_sort": ipaddr_sort,
-        }
-
-
-def first_addr(addresses, ipv4 = True):
-    version = ipaddress.IPv4Address if ipv4 else ipaddress.IPv6Address
-    for addr in addresses:
-        parsed = ipaddress.ip_address(xx)
-        if isinstance(parsed, version):
-            return parsed
-    raise ValueError("missing address")
-
-
-def ip_filter(addresses, networks):
-    if isinstance(addresses, dict):
-        return {k: ip_filter(v, networks) for k, v in addresses.items()}
-    ip_networks = [ipaddress.ip_network(n) for n in networks]
-    ip_addresses = [ipaddress.ip_address(a) for a in addresses]
-    return [str(a) for a in ip_addresses if any(a in n for n in ip_networks)]
-
-
-def add_origin(name, origin="."):
-    return dns.name.from_text(name, dns.name.from_text(origin)).to_text()
-
-
-def add_origin_keys(dct, origin="."):
-    return {add_origin(k, origin): v for k, v in dct.items()}
-
-
-def remove_domain_suffix(name):
-    parent = dns.name.from_text(name).parent()
-    return parent.to_text()
-
-
-def ipaddr_sort(addrs, types, unknown_after=True):
-    check_types = {
-        "global": attrgetter("is_global"),
-        "link-local": attrgetter("is_link_local"),
-        "loopback": attrgetter("is_loopback"),
-        "multicast": attrgetter("is_multicast"),
-        "private": attrgetter("is_private"),
-        "reserved": attrgetter("is_reserved"),
-        "site_local": attrgetter("is_site_local"),
-        "unspecified": attrgetter("is_unspecified"),
-    }
-
-    def addr_weight(addr):
-        if isinstance(addr, str):
-            addr = ipaddress.ip_address(addr.split("/")[0])
-        for index, ty in enumerate(types):
-            if check_types[ty](ipaddress.ip_address(addr)):
-                return index
-        return len(types) if unknown_after else -1
-
-    return sorted(addrs, key=addr_weight)
--- a/filter_plugins/suffix.py
+++ b/filter_plugins/suffix.py
@ -1,9 +0,0 @@
-class FilterModule:
-    def filters(self):
-        return {
-            "suffix": suffix,
-        }
-
-
-def suffix(value, suffix):
-    return value + suffix
--- a/filter_plugins/switch_range.py
+++ b/filter_plugins/switch_range.py
@ -1,38 +0,0 @@
-#!/usr/bin/python
-class FilterModule(object):
-    def filters(self):
-        return {
-            'range2list': self.range2list,
-        }
-
-    def range2list(self, port_range):
-        """
-            Convert a range into list
-
-            Exemple:
-            ```
-            >>> FilterModule.range2list("1-10,42")
-            [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 42]
-            ````
-        """
-        port_range = port_range.replace(" ", "").split(",")
-        ports = []
-        for r in port_range:
-            if "-" in r:
-                try:
-                    a, b = r.split("-")
-                except:
-                    raise Exception("A range must contain 2 values")
-                try:
-                    a = int(a)
-                    b = int(b)
-                except:
-                    raise TypeError("A range must contain integer")
-                for n in range(a, b+1):
-                    ports.append(n)
-            else:
-                try:
-                    ports.append(int(r))
-                except:
-                    raise TypeError("Value must be integer")
-        return list(set(ports))
--- a/flake.lock
+++ b/flake.lock
@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1757020766,
-        "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1754788789,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
--- a/flake.nix
+++ b/flake.nix
@ -1,27 +0,0 @@
-{
-  description = "Ansible Aurore";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
-    flake-parts.url = "github:hercules-ci/flake-parts";
-  };
-
-  outputs =
-    inputs@{
-      self,
-      nixpkgs,
-      flake-parts,
-      ...
-    }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [ "x86_64-linux" ];
-
-      perSystem =
-        { config, pkgs, ... }:
-        {
-          devShells = {
-            default = pkgs.callPackage ./shell.nix {};
-          };
-        };
-    };
-}
--- a/group_vars/all/bird.yml
+++ b/group_vars/all/bird.yml
@ -1,4 +0,0 @@
---
-bird__as:
-  aurore: 43619
-...
--- a/group_vars/all/chronyd.yml
+++ b/group_vars/all/chronyd.yml
@ -1,5 +0,0 @@
---
-chronyd__pools:
-  - ntp-1.int.infra.auro.re
-  - ntp-2.int.infra.auro.re
-...
--- a/group_vars/all/ifupdown2.yml
+++ b/group_vars/all/ifupdown2.yml
@ -1,24 +0,0 @@
---
-ifupdown2__wireguard_proto: wireguard
-ifupdown2__gateways:
-  adm:
-    - 2a09:6840:128::254
-    - 10.128.0.254
-  int:
-    - 2a09:6840:206::1
-    - 10.206.0.1
-  ext:
-    - 2a09:6840:211::1
-    - 10.211.0.1
-  monit:
-    - 2a09:6840:204::1
-    - 10.204.0.1
-  isp:
-    - 2a09:6840:210::1
-    - 10.210.0.1
-  pub:
-    - 2a09:6840:215::1
-    - 45.66.111.204
-  ovh:
-    - 92.222.211.254
-...
--- a/group_vars/all/openssh.yml
+++ b/group_vars/all/openssh.yml
@ -1,10 +0,0 @@
---
-openssh__users_ca_public_key:
-  "ecdsa-sha2-nistp384 AAAAE2VjZHNhLXNoYTItbmlzdHAzODQAAAAIbmlzdHAzODQAAAB\
-  hBIpT7d7WeR88bs53KkNkZNOzkPJ7CQ5Ui6Wl9LXzAjjIdH+hKJieBMHrKew7+kzxGYaTqXW\
-  F1fQWsACG6aniy7VZpsdgTaNw7qr9frGfmo950V7IlU6w1HRc5c+3oVBWpg=="
-
-openssh__authorized_principals:
-  - any
-  - "{{ inventory_hostname }}"
-...
--- a/group_vars/all/prometheus.yml
+++ b/group_vars/all/prometheus.yml
@ -1,3 +0,0 @@
---
-prometheus_node__text_dir: /var/run/prometheus-node-exporter
-...
--- a/group_vars/all/resolvconf.yml
+++ b/group_vars/all/resolvconf.yml
@ -1,13 +0,0 @@
---
-resolvconf__nameservers:
-  - 2a09:6840:206::1:1
-  - 2a09:6840:206::1:2
-  - 10.206.1.1
-  - 10.206.1.2
-
-resolvconf__domain: auro.re.
-
-resolvconf__search:
-  - "{{ inventory_hostname | remove_domain_suffix }}"
-  - auro.re.
-...
--- a/group_vars/all/root.yml
+++ b/group_vars/all/root.yml
@ -1,5 +0,0 @@
---
-root__shell: /bin/bash
-
-root__password: "{{ vault_root_password }}"
-...
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@ -87,24 +87,4 @@ apartment_block_dhcp: "{{ apartment_block }}"
 ipv6_base_prefix: "2a09:6840"

 is_aurore_host: "{{ 'aurore_vm' in group_names }}"
-
-# Borgbackup
-borg_keep_daily: 7
-borg_keep_weekly: 4
-borg_keep_monthly: 12
-borg_backup_directories:
-  - /etc
-  - /var
-borg_backup_exclude:
-  - /var/log
-  - /var/lib/docker
-  - /var/lib/lxcfs
-borg_encryption_passphrase: "{{ vault_borg_encryption_passphrase }}"
-
-borg_server_host: 10.128.0.4
-
-rsyslog_outputs:
-  - proto: relp
-    address: 10.128.0.241
-    port: 20514
 ...
--- a/group_vars/all/vault.yml
+++ b/group_vars/all/vault.yml
@ -1,297 +1,224 @@
 $ANSIBLE_VAULT;1.1;AES256
-35353866373931343963333639323431636465303562306166333735383462353032323461613232
-3666653438393936356535633661363838613233323932370a656439316234356339613532663237
-39373439366432363533303961396466623366323339383735316531653538633264393264353337
-3937323861616530640a666361323164353338306336616564663466616630393839613833373933
-65613161323164613334656631333336343262363835323962343662333133366561306139636261
-61656532666563333063356231636565626631633436623531313938663930396362343031356534
-34303565623832366664303561643137626433333164623730623639656439346639616164623865
-31613462316439613937313138313830323334373337366630323331393537633437303063353363
-66383930353930616137303436383864363439326139643361356231373939306439633332666232
-38363061636139346430373263613932336361356262656138663233386464373839366630303765
-35343064336533373238396430393536366438653534366565373733313962616364313061626133
-37666538313038643865346461626537353930366264643162376530353536623863656236303433
-31336561336131383635393238366464653934613130363831306335643935373033303162353534
-38353832653664633061646331653634393963333038306635313464636136616366313962333431
-39363934643266646131653236303138636163326663373765373761663062656463643162373038
-34656163633964626235366539663132396666623363303632363236303831613532393931373761
-65613435353162346233323533383537316231363437653239343233636533333966613066343932
-30626636306531333736613965396432373130356238313136336434356133353435643065626261
-32633732613361376261363831363866333332393132643439626639383438663438366330386534
-31303532323461303862346364386532663839323163653366356136666131363839663635343166
-38353962326430383561333630623030623536353838633231393763393238316530363939343536
-66323562336334376234613436373237303562363831323038366232393161356262653864663037
-34363436356332633363363963613635346337613438326436333836386534353738646166643333
-65356637366431326132363432663662346638383439383766646531363662356266313961356239
-31323236393538363662643662643535623633663738343266636163363835383030646661363966
-36366466386666613364313166353366333131343061353135306135656663323461303338346666
-32626231613738316233636361633337343635656334336536663865633465326639373966303137
-39383731303862353637386438306136303765333136653465663963663930383037343130316466
-33343932383033643530323136316632386230366338373362366462666233336530393561353933
-36356330386361303562666339306265663539616434336264373832636139313365633065343763
-31323633346536366635646562356266373964616338366165376331306561663938396661396164
-31363438326439343964666439356339326661666136303461343436303533363630353735633038
-38383365363739333034373031326530353962646661343039616230396132323833626162643964
-65363165333233643738373638353537343162366265316661353563353862623134663362633261
-32343364333236363738333130316538666536306664363661616536336264363438396464666533
-37616533363936356335663562366563303564623530303762363034343435326666356162316535
-61363133326263653937373037643930343565336166643939663466316232313535333965303737
-35313566353963616632313763366561633039626239353236323438383261663066323334333632
-62393265396235636461653862383830613634393431396131323439613362366463633239383761
-39343361663463633332666666346339363334366330393936373433353034653765323130383335
-63336338653333356438323264356162316638336338343033326639303237656663633233383735
-34646535633831636238316564373035353635383738356133326664626566623766366535333439
-30326437613539373163323464323635316632633930353931303466376661396135623031623133
-33653735336230666665616638353561623235343439666135386165313436306666643837616166
-37613964663837373137383736393063333037366433643632333963623038623636653639343936
-32383532613430623563623565633665663030616530643735653563303035616530313463643431
-31663361383835613631336638343338373639613532313561313231353765316237653431663462
-65366162326630656566663731316262336536303032386336666263326265316564336339316430
-31643066633438663562343730393534663338613165633635356333323635653161346136336261
-30313332383065633335396131656136613932346331343632386235643764363235376531376437
-61303130316537633830366662366237303934306561333134366463646464386530623631346264
-30356536613932613264643835356637356364653038383130366237656232333031313163643332
-34393865323162613936613264313864613734373032386266653432616535636464363463633564
-37343661623935353365333831623631386439343237383933313337393065653934303065313634
-61396163323937643837643636343337343231616265643765313932346462373735323737326663
-66316135646663376537613663373432393865623038363239356265303362326161366462356138
-65336536626634366363623865656234363335343662333134613835393635623434393036316638
-35366431653463626665663861303333363038666131643861646465663761623364333162343761
-64396131643136323634643461656339616361323030626166303930623838343438393465653364
-66633037616633316534386639306438363863363530376131363332353536656533393161313931
-34386636643737353738323265363435636239353261373466383430346461383932323634346466
-33666436343130643032626562613165396334323937353663376162643266646539353932313137
-62336162646535346631623332376334336538326530356233646239306337633365373562653166
-32383639353431666137396631663237313436393434626531316365666335306466363639626663
-63643861656537306133343138633535323737346538643063363330383366313362653933383365
-34313230663163303730326361303337373136346161353132626362623461343661663964333765
-37353165333762346539333730333731366532623531343962333037336464666530396437353666
-62313035323234643236343534663434356264643830636433323831313364663762646130306362
-32316530643230313230376662383439343639343336633431623135626134353134383030396264
-38623933356332336231343434663563653332633237653966663964646232623637313231366638
-30363966373362363432376562656436356338356561303133643432303736376234643632663137
-34336630356362303132343737376637303939623133363663306133383465613263356632383030
-61346138316538353638343833366261366534353963326162303866393430333964653333346539
-64386161663435646331613834363336373738396338653263323937623163663236366636343239
-36383135343763636139393331663139323431376562353165353662396165653235633464363035
-31393233636561366639373566623738636537363235666234633534376238323163363238393237
-64316132666530336135353434623866363739643830646463656536336136646334393064303630
-65343964613265333934306432313739633134663131666433386630303132663866343532363835
-38353237343630653561636365656561313636623065363836333663363934643162656534623864
-62373763353961646235613465646630306562386531396364386164633065643763396437316466
-32376564616562656136346563383266303963666136663863626137653462373430363363336364
-35333133303463363663356365626365613036633835323334653264626637353634373665643036
-65663736323235353964326466376163313630323265333631323866663137313665626238396130
-64653832626639626633376231326534303530373937396235366239626639356234363238633336
-34343064393334613732356332633361613633643039366537623465303739663635626365656631
-64343936613536636438313232376564376539623261623539346564303036303131366561643564
-61623630393032666636366338336266656264353631393061383162323766616530323734326134
-31623962373435323730323830373239363738663164653338623836386636626337623739366566
-61663835623038626266653062666264663639363763623139393862633061356164323530666665
-31623538333264633735643839376433653934383663333130336133653235313631336163343134
-33653533613430323834653730326661323462316338636338393063653866316335626633323137
-32653262353964653131343430383661643231383135643332616462343231323266333430373061
-62623136393239356166393964323830623239613434636361633365353862646130373865643136
-66346336363866393762353633353638663433363332356131626639326166393234313765346138
-64613431333139376139343234666664313236633031393938663431376336643133323964303938
-64616536613462306363613639613132383361393535333362363630393230636532316634373231
-63313839323263663237373937323361373533616465643830396666376661616631646561663130
-66376266363338666133313263653733646365653034653538333332623861323833633033393234
-39633834343231663166376333633635366261616561643363393137383736303436383339633734
-30623939343939373038656461333464353033313632643138393334373565383331326430653263
-66343630396135633636366337353061363730333364376664623234333434356661323935626633
-63336465343661393636333663306361386432373235313337353361333735373436633832633439
-30653766373230383364396638366237643932633364663639643661393438653339393031616338
-62396632353063376566333261356662356265373733323631363263396337383631383733393034
-65616434356530306661636633363333353138303631626565636637313738353338343334633533
-39313232356166623939383864346665626333363132663033326430366565336339306465343337
-34613736356534653534363034366431653861613534663261633739366361373134323566376335
-31313263313262353162353039623634653534346363323131633362323035633337366536366561
-64323432353236383839643662383138373938373834323262386364376162663839366232313433
-38643662613065663863636664636162333830353131636238383439323439316363383935623731
-62393964636137653935313338343465396633333461643032383730313139396462393936383630
-63353166633735623364653264643934666438383739663461373332623631323932333162303630
-39353637353437636537613935306539633163613334303833393832616338323061633532303361
-63656635333331376561363962386135303963303030396564356534333037623635613963313666
-65303664316164613835343930623338326235363933623533343961666664323836316231613465
-65373931666331326634316463663134613031363636363434643839386239333164333538393831
-65653935623431373238326231343439666635623730393639636131386162373466316164356263
-37316539656230316336303265646339303139306262396536633533366261346238393335393765
-39376630306639353862323834343830646330643737653631633361326134613666613430323433
-64363965653063316432353431386533386661386239636332323139393933653063643865646338
-34626433393731343535313766303237313866613166663333616535323661666362613439376166
-62626430363661303630346265383863613162356535306165633537383038613131346561306330
-61623435626363623762313832313031363665623933656238623131303362326137313266316630
-32366664633963626463613562643666383637383831343234666435373564306635343730373665
-36643436633066373962303965373663376266323133343233323563393065633162383237323162
-38656336306432623330616234373936306163646330313734653864386464646535666331616335
-32623163356337326665333731656438393633326638363635353733663861323934333536393338
-33656231373166313761643030363437373638366461653038363565623633623035393564643161
-38663064356239393034323761386435396437386534633734353938653239323533333531363965
-36316636353864626461303936313632663261353437396238363930626239336139323561373133
-61366330386135363039303166326231656331653632343261306531653731313465396131643330
-35616432613631636264333263363239616435303436653936386165343335356337343032386239
-37373230623366653834663031343738643063616661363138316262643635343439333838363632
-34353236393730363262303439313132663735336463323432303036366361666338363237313664
-39366434303839356163616136336237643061373633343737333036653362643635643536386436
-30336636333464626464326332343333656535666431353338336438346335346433313934346231
-32326231636262346232636366393361623830316238303537666164626339383061633765333039
-30633539666535366539383061396461313437383537656239393131326538636536356536643735
-66653336343364346635383761613731666263366465643336636661323263386364653035333062
-33616364393664613363383937653530356138316363633335386232336531373835303732383962
-65643264656134393663653333346531316365323730383363373564323133333032373330643232
-63373239366435643738353130353333646136303530643065383066313035366239326664363830
-36626366646264643130326261363536313835356638636139636434333362366363313133316130
-61383734636433313433303466323265386132363862643131613666306162396437643166393630
-32613464313530316262353938383735336262663939323730626662663235303638303065663939
-33636234383033393237303865633961333462663232363562386637333335373565663261363933
-31356436613138653765663162646566326134313736316130356336663536643466623331653039
-38616465306532666434333534356464666663613263383430336465376133393032623762323237
-63343462373834383566393466366332303235323865343730373062343739363265343164623262
-38346539343533636435626133306662623865653934666665363063356162326461316561383261
-33666362656635323262353066356330616263326134613635336261343438393838326438613435
-64343336393034303330323563346233653135633439386465653065633339643032636662313531
-38356234326632336161666666353030366238626262353831393532306166363432633939383166
-66316136333838653433383439623366333062313833616366656566393965393665613738303833
-38326139366330393863623365383963306361613665643962376664636134353533623836643362
-39626166353138646666633136363662393565336333393638626534636330313632326333353366
-39353133666532306531343137353834353133633165613566323135313362333962303637663965
-63383730663562646563333763356135613537666332393537663062653662623938353434323136
-39663965616437653232623333363762616233316530303833376332396165616635336532653035
-36306331643232336664363733376632323630616139353030343930343166623433616234616539
-34393131303363626166383037336262323662393431356463616665343463363432356132313531
-37653331336165626435343162663662386662613164336439636465363335386233383065393535
-31396466636465336164383563326236356463393831363534656536616664613361346463613837
-35366562623432353166303836353261313233663864626665663837336233653237373031393636
-64343763386361626232633032316466373161666536313363633765653365656538343130326566
-38396534323433343634333139333063633531343631316163346135643037323034633835363963
-32343963653263663438666537653963376133633661393562623131636465386266616166366566
-36343963623262656162303337366365616263376363366161373236323166353834616262393061
-39393239303335623332346236356335393836636533386432653164656334613738393533623764
-36363136353034633934323066323335626138353763333537353761303930623930353062373932
-30656339663333373431633763366433366266316563393332613334633966633339633230303166
-61346264386134623962316532343664386637303738333835343036633038323137323961323837
-33376431316465373165663338623538636136343538666235333334373664323463326336336334
-32303361393134653338646563643636356361366133633634393731343332313437643731366634
-30386466333965356135303732663433316363376438623764653464343564353835626435333230
-30646238393266643137373037326136306337306130343739633933626134643364326534386464
-65303531623335663766623037663630376366333631363165633762616564396538643866313465
-35343265663336303537663962643536653937373839313435383337353036313239653263323061
-63653865656461363334646466396135663338383065646464656631636666643030376363633333
-30333331636438656238326534656165396233633131306562336263653330396366343964313434
-66653862386531306236336339353935653335616638643831393430613533643533626135313835
-64313065373564323132663531626436623465663766663566643964353361303336386464386463
-38373036613536386436373535323664333231663437643962373339653236393339653064363530
-61393835343230356234376630613230326637636534336564383139366663663136306665363363
-66373237373530303062333935633634313766316461666439666433616236346434623535343531
-30383264303536653236363533383561613636303662663935303761353065336631353735376365
-63343162646663623736336638306465666233343031656137393037623035613236373930633131
-36366633656131633563336561323835343766356131343038643761663966656364376430366636
-36316633633736353436666539303039383231333437653666313435616536626434653833376532
-66376130653339643564646139633238643266316633363137313038363061386163613863313733
-66633665613537303834393233376463343965343664343564343832376238383064373262336162
-61313163303632373261383563363964353731363739306337333161333130656235363631343761
-61353265633338336466623830396466646233333039323065333636303035363563373366396334
-37366637306430396262376539653134396536643931643563386666623364346635363138373937
-61613232386666343033383031363439373335396362643130656235653066376537373062333363
-39373737316136303835616639363162363839376635666237353064323433373961326338393263
-34343162336336623530653531663136366136353139343561623532633139366533386263316364
-36306134356666343230643639303766343466353562643130363063343330393232663161306266
-66336435356265396330366566373137323265623431386535396665313335666332616233383664
-63656663363366613431366632306230633265306663336439306263646132626631363663643861
-30373330653637623733653165336132643965623232383839623535326336643239333133313030
-32326634643238333163383562393134623532363561393364616430366532633862396438306433
-33653235303639383333633035656533633165653137326130643961393965346266383861616333
-37306266393231336666343333643530353230383239343931303838623335303262313130616162
-65383962613965646438323065303962663965333231323139303438343631396363666330653330
-61323839333863343034356363366433313039383963303063346237366261363861643839396362
-31346637303032356463303564303562313639643563396261326538353834363737323235646430
-64343230336539663237306235623662333062396238383135616231383837366339376633663938
-65313739333065383335323437396232323564363733333437363133613766653334396431333036
-38333038656339363132346362333863643261376335666536306231316630303437306231646565
-61666334623736373832613366376438323664653531393938353234303030633532653561313665
-63613064663564646235373234326661303562646139323330343330343139633462646131353038
-62663535393738626432633564663564653663393937656634666137646363643365353930373266
-66373162373165653533383862363835346133313234326162393331666566316439633133316633
-66393733373333653630363334353833363565336338613361396335326166643630623133303466
-31663037663766356531663039386232316138393266333035613364316539353837653763616666
-32376431383965633138666536386532663761343537646266643566373132343762383966326233
-38373766353962323362366330383564636236363961333535313064313039343933346439396237
-66616631633539623537633164363665393239643633663338393765336434653930356662656164
-65366533633336313832633166376265376634613635363563643866323730343139306537323863
-61373461363237653634666331366436356335306265643639373034666131626238336632346632
-34613062346532656530626364343938636162383862653538353563363035346339623839663261
-39663438396362383866663336643035653833336466663037313764326434373061626232646333
-63336336383366333538613331303863356430373764363930363061383036343836386561663362
-63663232373563343461306131333263376437623534346562626536376138393939373064333231
-31303464656332383036616661656565313063346231623634356638326239343536316162613335
-34663232326438333966313663336465373833646634353934323361343833373661633265313239
-62656533656338376562323861396665353166623732623139353431336439386263363235316132
-35373933613236616362396363323031633166633837383634313638656430373634383563616463
-38353738636631626639636135363561623935646365316161376166653461356430326362623738
-64386537373230303239356334313663616336393439623431616639643233353662306265373232
-39343066353564316433653361333766363535636533626338386434646531653432313034393134
-62653733313636653331356363396531313136346136303661656466333138363366616530306536
-66373532626230313739306432363433313736316261383837393737356333326236323261613965
-36373064636138373134373530363533613031376362386334393464383062663663313234643432
-64363232376137613231313862386561313131376133376466393630383737306666393738613265
-66646236646632313832633366333335313239363763326464326361326263346636326332376336
-31306230373963636135643235306537623930636164346366623862303838653238373030653035
-35653634393532653566323063323761643738616532376262623163393461346334393034643862
-62653835363236303732386365626464346131363231336431316233643132383566356531346237
-66333933386539396366333565653938396564643464663165323535386262623532666237393630
-65336262636630386633626335636231616332353965356335666362313562643738306263376230
-63323938633237363431386639613830633765353232313236336233363736363566346237616637
-61656234376562323162656432393665393930313736313439316261363264333865356139343233
-63636638646332626365383839373765383864346532383236386266656635653333343032313231
-65626233313634333533653436626134373632363565653230656161613963323334613262646530
-66636331396130613934363939653238343463396639363731393363643830663362373439646337
-63396435376637666563333165623338386337613638366339656561366538366635363037366531
-32306235666231303762356665613738323336306465613531313964626631313731373963353964
-32616632376534316532643531386635386330313866326265393736376538616431323238333562
-36373238656361323336383466363563623333306634373164366134376635373262353533653330
-38643233363737356564653834316435336439663562343366353866336662356138323566363061
-63313336323435343861393164313130346438343862366530363233643266393964316265663535
-65323739306536373331326338326132383265343939663336303534633537393637353639636561
-64656432313636366434313465626562626638613232653230373530363234306537363665646633
-33326163663830353166643662386637323438366334386533303664356631653561323032666265
-61333165363636363634353461613039313362373863663739323231663230643635663466323430
-37393431333733313134326231313234353930663365646637386639643535316362626232323430
-32363631353565323663393235343336663930373439663861613661636433356366633065343935
-61356636323039656230353264646166626633316430653162383638336265653865373536643036
-35653166333765366231636163666638383262613432646334663430323565333538626665343763
-32646663356565646362646261343436383039623635666439643762616463656361386631313637
-61616164383734353634306633636338623837356230626263653161616664613266356432653335
-30646434346436383565343138623264386630333832386134666463313936383364333364383232
-39393066333666653734616463343530643537613437623766313237353033623662336137356534
-35303635623232333230363362353137656235373539316163653863326666383237303235316164
-34623138346261366238303037653764366537333561623135656236663435316565303931353939
-34663932303239393836363663343735313632333639633733323564343039346436343935373430
-66313863643361306161373634373738383462313831643161333230646435313261383534396464
-39663466643864666433366531323866333935373833663661323833623734646265393035613966
-62393165653135643737343333346232356638646437326664396466333063666135653338623266
-34663133636164386164636434666231643163343930353863306538333337643762616661366366
-63646336613433623862356365633563633235396337356535376335636633636563333738383061
-33326136393530353964666639633638643433653736376637386638336561643061323635373565
-65393836613638313165313262376166643561623131363836363531616232663333333063393039
-35643938626132383439393761623165303730396365323665613663643961663466393937333731
-30643662663034616631343336343236613437376362366234343436376563303466633030323465
-64626536333465626430333336353038336539313531303933633466333633336364363961353861
-31636135303332343733313637326461643264636236313331643438613365393733383764653432
-65346533616130396233613863633331613638316462366364346465353234373531393137336165
-36666336333036396262663661343962663763316531393765346536646236613331626139383230
-32623665353463326633646466376232343333666465616633333033663031643262663732323230
-36363439613934643037393562333237636262306330356638666235333361376136623462313736
-33373163336134316563353031616339336234623738373230323335623130376265386130333235
-64616261633232316131633062623163333135323737376462383539663137366539656261396238
-31363232356361376264373863663362346535346136313834623761333037343435326339633735
-33656465376264326334356365346437343062343631663430346561656531653662646530316133
-64396563376263306533306565623163316238326264306330393465333737303062363030343662
-65333633643635643737323231343664613735336230393835346132613331366266336434623937
-65616366633734373434333837326465613862633930626435623165633964313732373936346434
-30643161633238343435623538316134616161313461616538653161383032313038666638376432
-64646564626231656664306235633031356564373432626561386135653136313062383861323130
-34393331316439613363636631666262343334393739303631633936623964343938373334623230
-39343031663565333431333731363966623730666335346164623662373265643732306662393663
-39336137326533643533623865313934336464633634613436616438373531636562313762383666
-37386365333361626362
+66666438656133326638326138663066643238626366633137646134376233336639326365653163
+3737613361383538663934626164356535313133643730610a663634653164623665336136326430
+63383735653262393538383663653966623462326332653163316138313832346532326535336263
+6638373331343838610a323166393664633431323461396135653464396236333235333134613834
+37333866663935653832613036643131306333653565623261346134396534316163366636363134
+34653939363835303037666333623230643339333165613265653638376234646438393630383165
+38376162626538383263626664373634343063623630326334313265323330656465343865306361
+37643835366461353335626639646430633135616130646638376461316434306537346532353630
+31373039303862613264653836313763333566663065383361343261343462633934343139326135
+66393363393962636438383362613162303931316337626665336362633030653430346436326530
+62326664396534626664383834613936356462393163666431333731613339353038336634623532
+33633432363730616439386536626163383563333265386134356231376665336332376439333232
+31336466633135646461373364363534636439356137616632616431363638386234303637626537
+37653332366234386562656365333533326539353837343631636662666236643761323463376137
+35343834636562646339316139613265393736376265636564386639646537323136616464306630
+66333065323533663536336238356537373030333630626464363731313533313537346138616664
+34313635636664636135633035356666613261373065636462306438386461663361326132363439
+34396162373635313732653039326639366362653962376135613636396639656634313234396136
+65363639393532653237613237313563343865613833373562643764333930326539303138636166
+39313565653462613337616263663739333136393966663664653335333237626565636462663261
+62313831663732616133396662343332353365356162353436333135393738323761363164653161
+64393137343738393939316532613639373430656630386532366136393235383063626433396338
+66373337343232343964326435653039386338623166616537383466653030613361396462323038
+33623637323135313664306538323137333763653263326533323039373139396633313135333166
+38356236653731373132353063643038623866653330623537356230306563646262343531333830
+38626161393330303161313932616531326331633938656236313166313035613163323539353535
+63343136643361333431353762643631643262633266346139353165393962326634363764373930
+30363463623434633032366338316332313736656465366461633864373236653863393637636330
+34313936666432363562633531666466356633616664663063363263356632343931333766663466
+64633438333436623639333036636633366337383065313162666231613337306532653335363739
+36356139303461336139323963383465376366633064343031303864373735656430666261643565
+61323236623330636561653962323738323332383331303335663036626638383334333730303965
+33383063323438393532306330393366326561323632623238613836396635656631373430343662
+39333464643037666233373565633132386233353333313135306133343765373565393937656163
+38316238383832343063666334663733313162303337313262666430363538626134313065373336
+32393763633530326161333861333137363066366332613963393734663130613735393764653334
+39613439643364333665383465633765363063313536383835303964363731376165383830616265
+39663762306232646533353963353663343832353739333132366662306335313435663434383431
+36323032333731373032313263396565643561656531643462613931313435616438366132393135
+34303334383662386261386537373438373334623235643037613136653639353164353763613965
+62346231613333353331376433633633353537646639393739356137316131313536343736366532
+62313438326264303638323832653232643266626561303032666432353935396262316538333361
+39323138313234363764303036656631323636626633316436626637333863383230613132353563
+30623161643535643431663535386130643662616263343535326433353764626264343937383730
+66616433623234316262343531643531396662356135336336356233393438656263316138613138
+62323432306563313462366464653965663137383536633437653135343739393839343335366634
+30333834656335383763643637366565633339386330386237313236373463353663363463616636
+61326539363461343639366534643363353038663539366565653234646332626661613333336563
+63663939343465366565653665376237313366376162363833366666373264383131386531396436
+36383430613036633734346561633366613731373133373261626331336266383133653735646638
+64353266653531613264373864353631626331343166656263303165326665326163313539336230
+33656438613833306538643737663763343836393234633630633665393631373736353963343431
+63666366303230386336363933613935313636316361346632626561376562386264666464333639
+65396136623735326462316565356337363537343764653562653731386136366537306137666438
+63646364646138316264336334363437363638393561343138323762626666643039633130623537
+62363938323136326134633039646464353262393731313962373032623966343264333661393934
+38336435346161306238373963396265376263336632646436663837356331663138366561316433
+36623139336231366632323133623639356633393035333761363630633563306436326361306662
+31383261343035636164313463333532373064393765363332336465663430326164373538333530
+62393131666539343933393339306466336235396430326265656661643865663362616332343065
+66613561326162313235613131336130333565363263343665373565386164376165646136386136
+65656361316138303865636462326331353934376365613665316538616164646433356262663931
+65363166386139383736643664353266613133353263313336613361616237633066356562616534
+61303038666338313063383431313239393062653661393336333938663937306536383431646632
+63623031323034643664663134626433323466376133636330316533663462383736623463633332
+32373166313562613461643163366563656638346464343064636632373835393236336438633061
+63363363353437356339643333356531633033376230313330393365626164666335623262313533
+65373234346666663264373238663430373262313435316134313832303964656330386431663833
+33313363366566303535326365353135303863363534646439626664323032346664656530396530
+37633666383162343231333464633439643637356437383866303235616462346664316363336132
+62376661323764323936666165366566636531363736306561663934653533653433666466343438
+35306130323336613764633438626339636531626135373530373066363839313132346538613836
+65623635346233363331633261303761393466636137346331383038613739636366616164306265
+35646333653666373930303535643961343832653062303736613436666661323965373433363537
+35626533386162333364333538653166663838613433353138396661303930613838623635636366
+37626662303434303331666437363138336261303031343964383364313239623739343233353636
+34373433343539613664313164653364353835346263643031626434333037353766376233663236
+61313735303437393230663766323262383130623039393637633039316335383032346261323534
+35656666306262353638623638366339353364383939306330343430366631386161343061346462
+31623431626239376538663463393265366430626565396266393063646532353563663630623363
+36663436346161303066633435353863663163376231303732363563313263326637346234666231
+37656331623838366535303863376233356336613237353966653334343835613738343435646630
+31353731613934653462356630313164313262363966356336323437653037386234303531636465
+39393433373931393234633363383864336465346434333436643139643437656238623737363630
+35656334396438623132373164366464646462353033623965663963633437356337346636633563
+30376236303661323764643536353230373333316237323065616366363262643765666433623735
+64323663666434653761313431333131343536626537393161373063363163393563343465633664
+61356637636161386362363065313730366362373833633830353466356435323533356335636138
+64346266316530376437663336663161376330326331663664653634633537613835366233356132
+62636337613966306439613666336539313866323465366235396630353461613339623830336332
+31653865663734616462356637303332303339393937313031326330373639643934326336366431
+61383465373564393337333137616432626233306631623463316131633331346465646632326231
+32616261666531613265383536653139653335616130333030363433646561336634643464646164
+61383536336139376134336662353931623365353238333835353731373031323535373764303235
+39656362383665366463363730356264313564313035393332353136323763373538643864663966
+35313364323863643063353261613036346533326336633562623730363661333336336266626562
+35373037366166323363343362616562346264626564356631303463636432343635383965633136
+35663632306465353533383166666230363635326637656561333137366263376261383562386538
+63613563663463643737333537646335353137333434313363656531333465623562653864306665
+34313736346131636261663035326361613036393433346233373963333134616235393532333763
+62313136623031393364316361663536353063383065613334663239353932646230306461333764
+62306532653130353032306530636164363730323538613965323661393439613161356237656335
+30343330336131393636646639306532333864646563303363313331613630313430303834653864
+38313465303332303530326466373939343161633534353064333731343431336334303133343531
+64336534623066333863666636326364353839613565643132643266333861636663313930363434
+37656338356566646632393831613237613936663934333766633365373636643234346136633264
+64643865613938366530613365326163376566616562383032633636393234373439656538343130
+63666535646163346166396538386631373532626133643530326532353066313139656266313135
+38633131613364306165646630346361303136636434653234633164333235666166613061626337
+66396461636264616562666337343831303335373835386265666265616366393934323265333235
+30346332373635633935616539323331326165666362316462633432353666633135653136373662
+66306138633738653266336164346566616266626434356665386137313631646565646331303961
+30383961373962333133396665333339333230356666636636643235373236346666333239353763
+62653737313566376461336230623962353136666263656239373138353162666464633239386265
+39646336313932306236346534643431373562636265306166653433636565353037363633653530
+36393638663965613337646633363664663432303231366662646435626233303538346537366130
+65336232353162323337303234633734356236373131626339316363666537666538623438313833
+65383535636234303036346661373630303731663839323663336236643739303836333030343136
+62326539356535323731373938393238613133636432323166326133336362313465326262353530
+32613765633035616431656632366264633134626335356133363561383163396334313738376437
+66383266396365336338383338646465616438386234353635303565326365396432383431616636
+39346566306535306534383965313861343336326462316566643962346465333764653131383031
+32306533313137346166653863386134623062653637346535383130643936656331613866346337
+61366632316332316664613031323033626235326461336133343335323531633639363465306438
+66616262353066363637616530396362626161396439613134373537643266666562386436346638
+63623033353734373062373365663733666161366262303030306162386366653933326234646333
+61633337326265326334346261343663633539373533613963636438663638306130646234386434
+38346537623566313763383064666639376237656662383865653162336234303232386439373962
+31383961616333623736626534333536356136613137636662353664396135623134343663646638
+64376366346534663132616265356263356638303162306233383230363636323962333963353262
+64343232373063313036616634613939623433373262386134633233643635306137373630316334
+65336466646532343633663739626336393730383836653065356632333533633162646437366665
+31376531383262373566323664323161346563626366623133643462636363393835373834313862
+61323533306137356330666531366466303230653864386566613535363465313063363962653666
+62333639636332366537363631623430376163396333333663396430393334343732626361306439
+31623862663736633362373466626333663964356162653337633039323138353035656562396132
+33333837396164646564623735366266376562623835656566393361633730616130373931663461
+62376537613661616135346562393539346632343530363335373965323664653463383637656336
+31383835363931393537646132656164653730323639373835336334653561363835373663363730
+32376435626431356336633939326636313834346666656237376264633162323062663238353537
+34376336616234373165313064396361356263383239393036643761613630666230346361336666
+32333462313161656563323534393936373535316236393865636630366263373765323632643065
+66396465306234623565663139613830356139376135336230373364646465343562373361646337
+63363937663461636334366630303530343065323065633965643561366264613865356235636337
+65616564636635376635623937303330386537323966353034363331316363653136653939376439
+33323262396138316665383163306131383331623338343263353638343033323638323462303439
+33333631623638616430356666663161636534313038373130663030356537653265363232386530
+31646637333263613937646330363139353531373361376466396331386266393264366239356237
+66336333663665393035626639376163623435666530656563336434626238373736336335613036
+37303038646534363161343735633330343734616339633039376539343438373264393938663463
+32356562353161396230373239653631323038383661383037393761323131323038643064656665
+65346362373430656162346438653533306638303364386438383436333232363033383933666562
+32336630303932303636653438336462313466393463343363633662383237643837323363353765
+31666537643665343431613462616663303732666535363536613534656236356237336564363134
+33633266396630393837363364303963663435646166363566356530313835316236346332633164
+62656636643930363235636162646166626337326535643565616139363738396631613665626536
+66303238363335656538353265383864663436363834633664653433333163643537333433383766
+66613437366632346263623233646338316239316430303336323465656531326637323263343162
+31346632363464313637373766303765323435663939353063313236373632393866363562346335
+33386334653833663832396536663031613432656665306662396135363632333961663663386635
+62653631623636623963616431613131393734396365333131386433613561646266623739353330
+35336234653334653030356261353438363232366230316366313661626261646633333365393563
+66636532326239623463303662386536313461376464633738633038346664373032373364336166
+65306433316365613261383534326530376430323938306265313838626536373530636533336462
+33323034393765613737666237303233333439656463306633343237633634396331306338336139
+30336637633064373033363333353838646365313733646461663763373661366237366433363638
+31303565396133313932636665663261393136623730663535396337663961393363626435663062
+34343536383864323231653632393839616539333438353039633764336535653962393135333035
+39343332396130643239633639353661623565323861303137303764633266613130323431636164
+65653235386661333363653665626231356331333666363133343830326431396366373064653063
+61316233633635663866356261383766666430663130636166656330356639666233386131313737
+62333637366430636362316166356464643361363165616630393461356661396263316234346562
+61653032333639383762353335643036616566666230666465646338663834666161626263623862
+36383166623766623730333337313932363337356430373165666537346637316438313133656362
+65303936363730356131316232346433376261656661353533613265343065356539343366383538
+32366561663366656562356666303936336663353964623263336435653964626133383332373436
+30346236633266613363626632636464366435383430323365383436626361336531353363313439
+65663664623531363039303431303137623164633332616436353631633361383536616330363737
+39656535666131333863363832353664326534646233346435623937646566623466646131383335
+37643038306363336638393132666464393636623331306366636435633335333064383630393763
+62346366613238366532343761323663633137393133306564386533643132323661323938643933
+37316165346536393465613233666166633935666361376131613762383933363935353034653662
+30393138633665366336373038326436353932613138396462383163376361356435376462333237
+66363535616639356336323838653633323064643635373630653639613834386465363536306664
+34303831366364346361643564616435396661373765323530396635376161316334356137656664
+61333762366365633038653934653436613637636132353062373134316162336539653239613333
+34383666643136373337303466346165363137306563643964303839626264323231343262303836
+36643664633535326166313832666230656532353538363765316362336136323430636666356339
+30656635343038646131663837313232316262393863613863393031386336663730613761393466
+65343331346435393764343565326531653263336463346633653231643937323237383134626462
+32383362633666303131376164353261353232393036353636626566633862383063356136333036
+64346239363633393065633631343061343639323437303163343565646661366265643133386465
+30616235653231623263353736636231356136653236366531316131323635333137643666373437
+61336435613237306430343966383839663261386335616234363864353632653433393033656433
+39613835326130383864373832663536383261363135303664383131636164316634383831363233
+34386639616233373731306537633962383565336565343434663361343062326435343565666632
+64303830326436613932333161333930656666306165316333386237633161366161303537383465
+63326265626662376136636131323261643234656239316131383235636336303733386632633436
+65636663626434303637616366626463346533616237306130666365366564333735383032346635
+31623663363164316362343933663530663038616137633235656466366565306331343961343362
+65333935653664323266356637616532393538653231383935643432363838343335656165633832
+65626531316161646233626337626165656133643362626263363261326363306439353863353633
+38323161383739336631373266303633363964663833643130643235366137383637663134623664
+37363363306632646433376133383964643965623833373436663436393164666430363663363036
+62346538353538356566623562666166383162666537656335346337643132303339326333363933
+31396461346434623362353863303335623866316562316234386538343364343561333937326166
+33613237386239613533653036613636666662616461613031623065323630333766653265666439
+37653936303438333235366232343436346463643330373038646330306236643737386330663266
+33323631303836363239663731623435666630626335663134393532306235343033663365613237
+61643233356264306465623062303231643335643737366434306663393035613365616139646538
+34613338346633326432353064336233343765633638626639643430333233353235616639626239
+61663361643636653930666437633865386537383163643832326665316465616232636266366539
+62653061396265393831396431626462663033383637363565313531343764383931663665613064
+39383461353133306434323562393136313536623739353235346565376134306636613465633630
+34633737633536353338663061373738336337633134636639663730366537343463373635653833
+62393937393232316161366135353638666466373639613363653032666530633634306639333366
+38386432636639386435306638383035353134373261663038616137336164396235356131323038
+61333031316666353336343638623963616266643432613533616466353362353565363237636630
+38343662623838666134356537353434383564616335363032663436333133613762383063353562
+66646138383064636463623939643834396165633164333038373938636631306439356436373561
+64663835393863353131343334633137346162373838353738323938313162396165393632316566
+65326462613361643964386564376464353666386133616666623039366638383236653832393665
+623466653930303838323161316265323031
--- a/group_vars/dhcp/dhcpd.yml
+++ b/group_vars/dhcp/dhcpd.yml
@ -1,69 +0,0 @@
---
-dhcpd__omapi_key:
-  algorithm: hmac-sha512
-  secret: 99XuJO0ofX3VAnWWlyixWbQ5YTagPfgxyh14IbLNBb3/JzEklkWopvQdj/PXVYbfb/sRyFJBhLexPag4dLh7PA==
-
-dhcpd__interfaces:
-  - client0
-  - client1
-  - client2
-  - client3
-  - client4
-
-dhcpd__dns_servers:
-  - 10.128.10.3
-  - 10.128.10.103
-
-dhcpd__domain_search:
-  - isp.auro.re.
-  - auro.re.
-
-dhcpd__subnets:
-  - network: 100.64.0.0/27
-    routers:
-      - 100.64.0.1
-    start: 100.64.0.4
-    end: 100.64.0.30
-    domain_name: client0.isp.auro.re
-    failover: true
-  - network: 100.64.0.32/27
-    routers:
-      - 100.64.0.31
-    start: 100.64.0.33
-    end: 100.64.0.63
-    domain_name: client1.isp.auro.re
-    failover: true
-  - network: 100.64.0.64/27
-    routers:
-      - 100.64.0.65
-    start: 100.64.0.67
-    end: 100.64.0.95
-    domain_name: client2.isp.auro.re
-    failover: true
-  - network: 100.64.0.96/27
-    routers:
-      - 100.64.0.97
-    start: 100.64.0.99
-    end: 100.64.0.127
-    domain_name: client3.isp.auro.re
-    failover: true
-  - network: 100.64.0.128/27
-    routers:
-      - 100.64.0.129
-    start: 100.64.0.131
-    end: 100.64.0.159
-    domain_name: client4.isp.auro.re
-
-dhcpd__failover:
-  dhcp-1.isp.infra.auro.re: 10.210.1.1
-  dhcp-2.isp.infra.auro.re: 10.210.1.2
-
-dhcpd__failover_address: "{{ dhcpd__failover[inventory_hostname] }}"
-
-dhcpd__failover_peer_address: "{{ dhcpd__failover
-                                  | dict2items
-                                  | selectattr('key', '!=',
-                                               inventory_hostname)
-                                  | map(attribute='value')
-                                  | first }}"
-...
--- a/group_vars/dns/kresd.yml
+++ b/group_vars/dns/kresd.yml
@ -1,24 +0,0 @@
---
-kresd__listen:
-  - address: 0.0.0.0
-    port: 53
-    kind: dns
-  - address: "::"
-    port: 53
-    kind: dns
-  - address: 0.0.0.0
-    port: 853
-    kind: tls
-  - address: "::"
-    port: 853
-    kind: tls
-  - address: 0.0.0.0
-    port: 8453
-    kind: webmgmt
-  - address: "::"
-    port: 8453
-    kind: webmgmt
-    tls: false
-
-kresd__cache_size: 512
-...
--- a/group_vars/edge/keepalived.yml
+++ b/group_vars/edge/keepalived.yml
@ -1,21 +0,0 @@
---
-keepalived__virtual_router_id: 81
-
-keepalived__interface: back0
-
-keepalived__virtual_addresses:
-  crans0:
-    - 185.230.79.254/29
-    - 2a0c:700:28::2/64
-    - fe80::1/10
-  zayo0:
-    - 2001:1b48:2:103::d7:2/126
-    - 83.167.52.69/31
-    - fe80::1/10
-  oti0:
-    - 2a00:a4c0:100c:1::b/127
-    - 77.95.70.11/31
-    - fe80::1/10
-
-keepalived__main: "{{ inventory_hostname_short == 'edge-1' }}"
-...
--- a/group_vars/infra/bird.yml
+++ b/group_vars/infra/bird.yml
@ -1,86 +0,0 @@
---
-bird__kernel:
-  kernel:
-    learn: true
-    import: accept
-    export: accept
-
-bird__ospf:
-  limits:
-    import: 4000
-    export: 4000
-  import: accept
-  export:
-    protos: kernel
-  areas:
-    0:
-      broadcast:
-        - back0
-      stub:
-        - monit0
-        - wifi0
-        - int0
-        - sw0
-        - bmc0
-        - pve0
-        - isp0
-        - ext0
-        - pub0
-        - th30
-        - ups0
-    1:
-      broadcast:
-        - vpn0
-
-bird__bgp:
-  edge1:
-    local:
-      address: "{{ bird__bgp_addr.back }}"
-      as: "{{ bird__as.aurore }}"
-    neighbor:
-      address:
-        - 2a09:6840:203::1:1
-        - 10.203.1.1
-      as: "{{ bird__as.aurore }}"
-    import:
-      - pref_src: "{{ bird__pref_src_addr }}"
-      - accept
-    export: reject
-  edge2:
-    local:
-      address: "{{ bird__bgp_addr.back }}"
-      as: "{{ bird__as.aurore }}"
-    neighbor:
-      address:
-        - 2a09:6840:203::1:2
-        - 10.203.1.2
-      as: "{{ bird__as.aurore }}"
-    import:
-      - pref_src: "{{ bird__pref_src_addr }}"
-      - accept
-    export: reject
-      #wg1:
-      #local:
-      #address: "{{ bird__bgp_addr.vpn }}"
-      #as: "{{ bird__as.aurore }}"
-      #neighbor:
-      #address:
-      #  - 2a09:6840:213::1:3
-      #  - 10.213.1.3
-      #as: "{{ bird__as.aurore }}"
-      #rr_cluster_client: 10.203.1.1
-      #import: reject
-      #export: accept
-      #wg2:
-      #local:
-      #address: "{{ bird__bgp_addr.vpn }}"
-      #as: "{{ bird__as.aurore }}"
-      #neighbor:
-      #address:
-      #  - 2a09:6840:213::1:4
-      #  - 10.203.1.4
-      #as: "{{ bird__as.aurore }}"
-      #rr_cluster_client: 10.203.1.1
-      #import: reject
-      #export: accept
-...
--- a/group_vars/infra/firewall.yml
+++ b/group_vars/infra/firewall.yml
@ -1,457 +0,0 @@
---
-firewall__zones:
-  adm-legacy:
-    addrs:
-      - 2a09:6840:128::/64
-      - 10.128.0.0/16
-  ups:
-    addrs:
-      - 2a09:6840:201::/64
-      - 10.201.0.0/16
-  back:
-    addrs:
-      - 2a09:6840:203::/64
-      - 10.203.0.0/16
-  monit:
-    addrs:
-      - 2a09:6840:204::/64
-      - 10.204.0.0/16
-  wifi:
-    addrs:
-      - 2a09:6840:205::/64
-      - 10.205.0.0/16
-  int:
-    addrs:
-      - 2a09:6840:206::/64
-      - 10.206.0.0/16
-  sw:
-    addrs:
-      - 2a09:6840:207::/64
-      - 10.207.0.0/16
-  bmc:
-    addrs:
-      - 2a09:6840:208::/64
-      - 10.208.0.0/16
-  pve:
-    addrs:
-      - 2a09:6840:209::/64
-      - 10.209.0.0/16
-  isp:
-    addrs:
-      - 2a09:6840:210::/64
-      - 10.210.0.0/16
-  ext:
-    addrs:
-      - 2a09:6840:211::/64
-      - 10.211.0.0/16
-  pub:
-    addrs:
-      - 2a09:6840:215::/64
-      - 45.66.111.192/27
-  vpn-clients:
-    addrs:
-      - 2a09:6840:212::/64
-      - 10.212.0.0/16
-  vpn:
-    addrs:
-      - 2a09:6840:213::/64
-      - 10.213.0.0/16
-  infra:
-    zones:
-      - adm-legacy
-      - ups
-      - back
-      - monit
-      - wifi
-      - int
-      - sw
-      - bmc
-      - pve
-      - isp
-      - ext
-      - pub
-      - vpn
-  internet:
-    negate: true
-    addrs:
-      - 2a09:6840::/32
-      - 2a09:6841::/32
-      - 2a09:6842::/32
-      - 45.66.108.0/22
-      - 10.0.0.0/8
-      - 100.64.0.0/10
-  prometheus.int:
-    addrs:
-      - 2a09:6840:204::1:1
-      - 10.204.1.1
-      - 2a09:6840:204::1:2
-      - 10.204.1.2
-  grafana.adm:
-    addrs:
-      - 2a09:6840:128::98
-      - 10.128.0.98
-  re2o-ldap.adm:
-    addrs:
-      - 2a09:6840:128::21
-      - 10.128.0.21
-  ldap-replica-edc.adm:
-    addrs:
-      - 2a09:6840:128::4:249
-      - 10.128.4.249
-  nextcloud.adm:
-    addrs:
-      - 2a09:6840:128::58
-      - 10.128.0.58
-  dns.int:
-    addrs:
-      - 2a09:6840:206::1:1
-      - 10.206.1.1
-      - 2a09:6840:206::1:2
-      - 10.206.1.2
-  ntp.int:
-    addrs:
-      - 2a09:6840:206::1:5
-      - 10.206.1.5
-      - 2a09:6840:206::1:6
-      - 10.206.1.6
-  docker-ovh.adm:
-    addrs:
-      - 2a09:6840:128::150
-      - 10.128.0.150
-  mx.test:
-    addrs:
-      - 2a09:6840:211::1:5
-      - 45.66.111.208
-      - 10.128.1.5
-  proxy.pub:
-    addrs:
-      - 2a09:6840:215::1:1
-      - 45.66.111.206
-  collabora.ext:
-    addrs:
-      - 2a09:6840:211::1:1
-      - 10.211.1.1
-  grafana.ext:
-    addrs:
-      - 2a09:6840:211::1:7
-      - 10.211.1.7
-  ns-1.pub:
-    addrs:
-      - 2a09:6840:215::1:2
-      - 45.66.111.205
-  ns-2.pub:
-    addrs:
-      - 2a09:6840:215::1:3
-      - 45.66.111.207
-  ns-master.int:
-    addrs:
-      - 2a09:6840:206::1:7
-      - 10.206.1.7
-  tor.pub:
-    addrs:
-      - 45.66.111.215
-      - 2a09:6840:215::1:215
-  jitsi.pub:
-    addrs:
-      - 45.66.111.216
-      - 2a09:6840:215::1:216
-  log-1.int:
-    addrs:
-      - 10.206.1.9
-      - 2a09:6840:206::1:9
-  log-2.int:
-    addrs:
-      - 10.206.1.10
-      - 2a09:6840:206::1:10
-
-firewall__input:
-  - iif:
-      - back0 # FIXME link-local
-      - vpn0
-    verdict: accept
-  - src:
-      - back
-      - vpn
-    verdict: accept
-  - src: monit
-    protocols:
-      tcp:
-        dport:
-          - 9100
-          - 9700
-    verdict: accept
-  - src: monit
-    protocols:
-      tcp:
-        dport: 9324
-    verdict: accept
-  - protocols:
-      icmp: true
-    verdict: accept
-  - protocols:
-      tcp:
-        dport: 22
-    verdict: accept
-  - verdict: drop
-
-firewall__output:
-  - verdict: accept
-
-firewall__forward:
-  - src: back
-    dst: infra
-    verdict: accept
-  - src: infra # FIXME: temporary
-    dst: internet
-    verdict: accept
-  - src: monit
-    dst: bmc
-    protocols:
-      icmp: true
-    verdict: accept
-  - dst: mx.test
-    protocols:
-      icmp: true
-    verdict: accept
-  - dst: mx.test
-    protocols:
-      tcp:
-        dport:
-          - 25
-          - 465
-          - 993
-    verdict: accept
-  # NS
-  - dst:
-      - ns-1.pub
-      - ns-2.pub
-    protocols:
-      tcp:
-        dport: 53
-    verdict: accept
-  - dst:
-      - ns-1.pub
-      - ns-2.pub
-    protocols:
-      udp:
-        dport: 53
-    verdict: accept
-  - src:
-      - ns-1.pub
-      - ns-2.pub
-    dst: ns-master.int
-    protocols:
-      udp:
-        dport: 53
-    verdict: accept
-  - src:
-      - ns-1.pub
-      - ns-2.pub
-    dst: ns-master.int
-    protocols:
-      tcp:
-        dport: 53
-    verdict: accept
-  # SNMP
-  - src: monit
-    dst:
-      - sw
-      - ups
-      - bmc
-    protocols:
-      udp:
-        dport: 161
-    verdict: accept
-  - src: monit
-    dst:
-      - sw
-      - ups
-      - bmc
-    protocols:
-      tcp:
-        dport: 161
-    verdict: accept
-  # Alertmanager
-  - src: monit
-    dst: docker-ovh.adm
-    protocols:
-      tcp:
-        dport: 9093
-    verdict: accept
-  - src: adm-legacy
-    dst: bmc
-    verdict: accept
-  # Prometheus for Grafana
-  - src: grafana.adm
-    dst: prometheus.int
-    protocols:
-      tcp:
-        dport: 9090
-    verdict: accept
-  # Prometheus for Grafana nixos
-  - src: grafana.ext
-    dst: prometheus.int
-    protocols:
-      tcp:
-        dport: 9090
-    verdict: accept
-  - src: grafana.ext
-    dst: re2o-ldap.adm
-    protocols:
-      tcp:
-        dport: 389
-    verdict: accept
-  - src: grafana.ext
-    dst: ldap-replica-edc.adm
-    protocols:
-      tcp:
-        dport: 389
-    verdict: accept
-  # Admin VPN clients
-  - src: vpn-clients
-    dst: infra
-    verdict: accept
-  # Prometheus node
-  - src: monit
-    dst: infra
-    protocols:
-      tcp:
-        dport:
-          - 9100
-          - 9700
-    verdict: accept
-  # Prometheus bird
-  - src: monit
-    dst: back
-    protocols:
-      tcp:
-        dport: 9324
-    verdict: accept
-  # Prometheus kresd
-  - src: monit
-    dst: dns.int
-    protocols:
-      tcp:
-        dport: 8453
-    verdict: accept
-  # Allow DNS from infra to dns-{1,2}
-  - src: infra
-    dst: dns.int
-    protocols:
-      udp:
-        dport: 53
-    verdict: accept
-  - src: infra
-    dst: dns.int
-    protocols:
-      tcp:
-        dport: 53
-    verdict: accept
-  # Allow NTP from infra to ntp-{1,2} 
-  - src: 
-      - infra
-      - pub
-    dst: ntp.int
-    protocols:
-      udp:
-        dport: 123
-    verdict: accept
-  # Admin Wireguard
-  - dst:
-      - 2a09:6840:211::1:1
-      - 45.66.111.204
-      - 10.211.1.1
-    protocols:
-      udp:
-        dport: 5121
-    verdict: accept
-  # Proxy web
-  - dst: 
-      - jitsi.pub
-      - proxy.pub
-    protocols:
-      tcp:
-        dport:
-          - 80
-          - 443
-    verdict: accept
-  - src: proxy.pub
-    dst: grafana.adm
-    protocols:
-      tcp:
-        dport: 3000
-    verdict: accept
-  - src: proxy.pub
-    dst: grafana.ext
-    protocols:
-      tcp:
-        dport: 80
-    verdict: accept
-  - src: proxy.pub
-    dst: nextcloud.adm
-    protocols:
-      tcp:
-        dport: 8080
-  - src: proxy.pub
-    dst: adm-legacy
-    protocols:
-      tcp:
-        dport:
-          - 80
-          - 443
-    verdict: accept
-  # ICMP to public vlan
-  - dst: pub
-    protocols:
-      icmp: true
-    verdict: accept
-  # Proxy -> Collabora
-  - src: proxy.pub
-    dst: collabora.ext
-    protocols:
-      tcp:
-        dport: 9980
-    verdict: accept
-  # Collabora -> Proxy
-  - src: collabora.ext
-    dst: proxy.pub
-    protocols:
-      tcp:
-        dport:
-          - 80
-          - 443
-    verdict: accept
-  # Tor: SSH
-  - dst: tor.pub
-    protocols:
-      tcp:
-        dport: 
-          - 22
-          - 4444
-    verdict: accept
-  # Jitsi UDP
-  - dst: jitsi.pub
-    protocols:
-      udp:
-        dport:
-          - 3478
-          - 10000
-  # Jitsi TCP
-  - dst: jitsi.pub
-    protocols:
-      tcp:
-        dport:
-          - 5349
-
-firewall__nat:
-  - src: 10.0.0.0/8
-    dst: internet
-    protocols: null
-    snat:
-      addr: 45.66.111.200/30
-  #- src: monit
-  #  dst: adm-legacy
-  #  protocols: null
-  #  snat:
-  #    addr: 10.203.1.3/32
-...
--- a/group_vars/infra/keepalived.yml
+++ b/group_vars/infra/keepalived.yml
@ -1,59 +0,0 @@
---
-keepalived__virtual_router_id: 82
-
-keepalived__interface: back0
-
-keepalived__virtual_addresses:
-  ups0:
-    - 10.201.0.1/16
-    - 2a09:6840:201::1/64
-    - fe80::1/10
-  monit0:
-    - 10.204.0.1/16
-    - 2a09:6840:204::1/64
-    - fe80::1/10
-  wifi0:
-    - 10.205.0.1/16
-    - 2a09:6840:205::1/64
-    - fe80::1/10
-  int0:
-    - 10.206.0.1/16
-    - 2a09:6840:206::1/64
-    - fe80::1/10
-  sw0:
-    - 10.207.0.1/16
-    - 2a09:6840:207::1/64
-    - fe80::1/10
-  bmc0:
-    - 10.208.0.1/16
-    - 2a09:6840:208::1/64
-    - fe80::1/10
-  pve0:
-    - 10.209.0.1/16
-    - 2a09:6840:209::1/64
-    - fe80::1/10
-  isp0:
-    - 10.210.0.1/16
-    - 2a09:6840:210::1/64
-    - fe80::1/10
-  ext0:
-    - 10.211.0.1/16
-    - 2a09:6840:211::1/64
-    - fe80::1/10
-  th30:
-    - 10.126.0.6/24
-    - fe80::1/10
-  pub0:
-    - 2a09:6840:215::1/64
-    - 45.66.111.204/27
-    - fe80::1/10
-
-#keepalived__virtual_routes:
-#  ext0:
-#    - 45.66.111.204/30
-
-keepalived__virtual_blackholes:
-  - 45.66.111.200/30 # NAT
-
-keepalived__main: "{{ inventory_hostname_short == 'infra-1' }}"
-...
--- a/group_vars/isp/bird.yml
+++ b/group_vars/isp/bird.yml
@ -1,53 +0,0 @@
---
-bird__kernel:
-  kernel:
-    learn: true
-    import: accept
-    export: accept
-
-bird__ospf:
-  limits:
-    import: 4000
-    export: 4000
-  import: accept
-  export:
-    protos: kernel
-  areas:
-    0:
-      broadcast:
-        - back0
-      stub:
-        - client0
-        - client1
-        - client2
-        - client3
-        - client4
-
-bird__bgp:
-  edge1:
-    local:
-      address: "{{ bird__bgp_addr.back }}"
-      as: "{{ bird__as.aurore }}"
-    neighbor:
-      address:
-        - 2a09:6840:203::1:1
-        - 10.203.1.1
-      as: "{{ bird__as.aurore }}"
-    import:
-      - pref_src: "{{ bird__pref_src_addr }}"
-      - accept
-    export: reject
-
-bird__radv:
-  rdnss:
-    - 2a09:6840:206::1:1
-    - 2a09:6840:206::1:2
-  interfaces:
-    client0:
-      max_interval: 5
-      prefixes:
-        - 2a09:6841::/64
-      dnssl: client0.isp.auro.re
-      domain_search:
-        - auro.re
-...
--- a/group_vars/isp/firewall.yml
+++ b/group_vars/isp/firewall.yml
@ -1,40 +0,0 @@
---
-firewall__zones:
-  internet:
-    negate: true
-    addrs:
-      - 2a09:6840::/32
-      - 2a09:6841::/32
-      - 2a09:6842::/32
-      - 45.66.108.0/22
-      - 10.0.0.0/8
-      - 100.64.0.0/10
-  clients:
-    addrs:
-      - 100.64.0.0/10
-  non_clients:
-    negate: true
-    zones: clients
-  allowed_clients:
-    file:
-      path: /var/run/firewall/allowed_clients.yml
-      default: []
-
-firewall__input:
-  - verdict: accept
-
-firewall__output:
-  - verdict: accept
-
-firewall__forward:
-  - src: allowed_clients
-    dst: non_clients
-    verdict: accept
-
-firewall__nat:
-  - src: clients
-    dst: internet
-    protocols: null
-    snat:
-      addr: 45.66.111.220
-...
--- a/group_vars/isp/keepalived.yml
+++ b/group_vars/isp/keepalived.yml
@ -1,32 +0,0 @@
---
-keepalived__virtual_router_id: 80
-
-keepalived__interface: back0
-
-keepalived__virtual_addresses:
-  client0:
-    - 100.64.0.1/27
-    - 2a09:6841::1/56
-    - fe80::1/10
-  client1:
-    - 100.64.0.33/27
-    - 2a09:6841:0:1::1/64
-    - fe80::1/10
-  client2:
-    - 100.64.0.65/27
-    - 2a09:6841:0:2::1/64
-    - fe80::1/10
-  client3:
-    - 100.64.0.97/27
-    - 2a09:6841:0:3::1/64
-    - fe80::1/10
-  client4:
-    - 100.64.0.129/27
-    - 2a09:6841:0:4::1/64
-    - fe80::1/10
-
-keepalived__virtual_blackholes:
-  - 45.66.111.220/32
-
-keepalived__main: "{{ inventory_hostname_short == 'isp-1' }}"
-...
--- a/group_vars/ns/knotd.yml
+++ b/group_vars/ns/knotd.yml
@ -1,71 +0,0 @@
---
-knotd__listen:
-  - address: 0.0.0.0
-  - address: "::"
-
-knotd__keys:
-  xfr:
-    algorithm: hmac-sha512
-    secret: "{{ vault_knotd_xfr_key }}"
-
-knotd__remotes:
-  xfr-master:
-    address: 2a09:6840:206::1:7
-    key: xfr
-
-knotd__acl:
-  notify-master:
-    address:
-      - 2a09:6840:206::1:7
-      - 10.206.1.7
-    key: xfr
-    action: notify
-
-knotd__queryacl:
-  local:
-    addresses:
-      - 10.0.0.0/8
-
-knotd__zones:
-  auro.re:
-    dnssec_validation: true
-    acl:
-      - notify-master
-    master: xfr-master
-  test.auro.re:
-    dnssec_validation: true
-    acl:
-      - notify-master
-    master: xfr-master
-  infra.auro.re:
-    dnssec_validation: true
-    acl:
-      - notify-master
-    #queryacl: local
-    master: xfr-master
-  108.66.45.in-addr.arpa:
-    dnssec_validation: false
-    acl:
-      - notify-master
-    master: xfr-master
-  109.66.45.in-addr.arpa:
-    dnssec_validation: false
-    acl:
-      - notify-master
-    master: xfr-master
-  110.66.45.in-addr.arpa:
-    dnssec_validation: false
-    acl:
-      - notify-master
-    master: xfr-master
-  111.66.45.in-addr.arpa:
-    dnssec_validation: false
-    acl:
-      - notify-master
-    master: xfr-master
-  0.4.8.6.9.0.a.2.ip6.arpa:
-    dnssec_validation: false
-    acl:
-      - notify-master
-    master: xfr-master
-...
--- a/group_vars/ntp/chronyd.yml
+++ b/group_vars/ntp/chronyd.yml
@ -1,13 +0,0 @@
---
-chronyd__allow_networks:
-  - 2a09:6840::/32
-  - 10.0.0.0/8
-
-chronyd__pools:
-  - 0.pool.ntp.org
-  - 1.pool.ntp.org
-  - 2.pool.ntp.org
-  - 3.pool.ntp.org
-
-chronyd__local_stratum: 10
-...
--- a/group_vars/prom/prometheus/bird.yml
+++ b/group_vars/prom/prometheus/bird.yml
@ -1,144 +0,0 @@
---
-prometheus__scraping_bird:
-  targets: "{{ groups.router }}"
-  address:
-    port: 9324
-
-prometheus__rules_bird:
-  - record: bird:protocol_up:bgp_all
-    expr:
-      label_replace(
-        bird_protocol_up{proto="BGP"},
-        "group", "$1",
-        "instance", "^([^0-9\\.]+)-[0-9]+.*"
-      )
-  # FIXME: sessions en cours d'installation, pas encore monitorées
-  - record: bird:protocol_up:bgp
-    expr:
-      bird:protocol_up:bgp_all
-      unless bird:protocol_up:bgp_all{
-        group="edge",
-        name=~"^(viarezo|isp[12]|rezel)[46]$"
-      }
-  # Sessions qui ne sont volontairement pas redondées
-  # au sein d'un groupe
-  - record: bird:protocol_up:bgp:non_redundant
-    expr:
-      bird:protocol_up:bgp{
-        group="edge",
-        name=~"^(oti|crans|legacy|edge)[46]$"
-      }
-  # Sessions qui le sont
-  - record: bird:protocol_up:bgp:redundant
-    expr:
-      bird:protocol_up:bgp
-      unless
-      bird:protocol_up:bgp:non_redundant
-  - alert: BirdBGPRedundancyDegraded
-    expr:
-      (
-        count by (group, name) (
-          bird:protocol_up:bgp:redundant{state="Established"}
-        ) + (
-          count by (group, name) (
-            bird:protocol_up:bgp:redundant{state!="Established"} * 0
-          )
-        )
-      ) < 2
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Count: !unsafe "{{ $value }}"
-      Group: !unsafe "{{ $labels.group }}"
-  - alert: BirdBGPDown
-    expr:
-      (
-        count by (group, name) (
-          bird:protocol_up:bgp{state="Established"}
-        ) + (
-          count by (group, name) (
-            bird:protocol_up:bgp{state!="Established"} * 0
-          )
-        )
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Group: !unsafe "{{ $labels.group }}"
-  # TODO: warning pour redondant ?
-  - alert: BirdBGPNoExportedPrefixRedundant
-    expr:
-      bird_protocol_prefix_export_count{
-        export_filter!="REJECT",
-      } * on (instance, name) group_left (group) (
-        bird:protocol_up:bgp:redundant{state="Established"}
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Group: !unsafe "{{ $labels.group }}"
-  - alert: BirdBGPNoImportedPrefixRedundant
-    expr:
-      bird_protocol_prefix_import_count{
-        import_filter!="REJECT",
-      } * on (instance, name) group_left (group) (
-        bird:protocol_up:bgp:redundant{state="Established"}
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Group: !unsafe "{{ $labels.group }}"
-  - alert: BirdBGPNoExportedPrefixNonRedundant
-    expr:
-      sum by (group) (
-        bird_protocol_prefix_export_count{
-          export_filter!="REJECT",
-        } * on (instance, name) group_left (group) (
-          bird:protocol_up:bgp:non_redundant{state="Established"}
-        )
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Group: !unsafe "{{ $labels.group }}"
-  - alert: BirdBGPNoImportedPrefixNonRedundant
-    expr:
-      sum by (group) (
-        bird_protocol_prefix_import_count{
-          import_filter!="REJECT",
-        } * on (instance, name) group_left (group) (
-          bird:protocol_up:bgp:non_redundant{state="Established"}
-        )
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Session: !unsafe "{{ $labels.name }}"
-      Group: !unsafe "{{ $labels.group }}"
-  - alert: BirdOSPFNeighboursChange
-    expr:
-      changes(bird_ospf_neighbor_count[5m]) > 0
-      or changes(bird_ospfv3_neighbor_count[5m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-  - alert: BirdOSPFDown
-    expr:
-      bird_ospf_running == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Instance: !unsafe "{{ $labels.name }}"
-...
--- a/group_vars/prom/prometheus/common.yml
+++ b/group_vars/prom/prometheus/common.yml
@ -1,11 +0,0 @@
---
-prometheus__rules_common:
-  - alert: CollectorDown
-    expr:
-      up == 0
-    for: 3m
-    labels:
-      severity: critical
-    annotations:
-      Job: !unsafe "{{ $labels.job }}"
-...
--- a/group_vars/prom/prometheus/eaton.yml
+++ b/group_vars/prom/prometheus/eaton.yml
@ -1,11 +0,0 @@
---
-prometheus__scraping_eaton:
-  targets: "{{ groups.eaton_ups }}"
-  address: 127.0.0.1:9116
-  path: /snmp
-  params:
-    module:
-      - eaton
-
-prometheus__rules_eaton: {}
-...
--- a/group_vars/prom/prometheus/ilo.yml
+++ b/group_vars/prom/prometheus/ilo.yml
@ -1,13 +0,0 @@
---
-prometheus__scraping_ilo:
-  targets: "{{ groups.ilo }}"
-  address: 127.0.0.1:9116
-  path: /snmp
-  timeout: 180s
-  interval: 180s
-  params:
-    module:
-      - ilo
-
-prometheus__rules_ilo: {}
-...
--- a/group_vars/prom/prometheus/jitsi.yml
+++ b/group_vars/prom/prometheus/jitsi.yml
@ -1,6 +0,0 @@
---
-prometheus__scraping_jitsi:
-  targets: ["jitsi.pub.infra.auro.re"]
-  address:
-    port: 9700
-...
--- a/group_vars/prom/prometheus/keepalived.yml
+++ b/group_vars/prom/prometheus/keepalived.yml
@ -1,23 +0,0 @@
---
-prometheus__rules_keepalived:
-  - alert: KeepalivedVrrpFault
-    expr:
-      keepalived_vrrp_state{state="fault"} > 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Instance: !unsafe "{{ $labels.instance }}"
-  - alert: KeepalivedMasterChange
-    expr:
-      changes(
-        keepalived_vrrp_state{
-          keepalived_vvrp_state="master"
-        }[1m]
-      ) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      Instance: !unsafe "{{ $labels.instance }}"
-...
--- a/group_vars/prom/prometheus/kresd.yml
+++ b/group_vars/prom/prometheus/kresd.yml
@ -1,6 +0,0 @@
---
-prometheus__scraping_kresd:
-  targets: "{{ groups.dns }}"
-  address:
-    port: 8453
-...
--- a/group_vars/prom/prometheus/main.yml
+++ b/group_vars/prom/prometheus/main.yml
@ -1,28 +0,0 @@
---
-prometheus__alertmanager_targets:
-  - docker-ovh.adm.auro.re:9093
-
-prometheus__tsdb_retention_time: 90d
-
-prometheus__scraping:
-  node: "{{ prometheus__scraping_node }}"
-  prometheus: "{{ prometheus__scraping_prometheus }}"
-  kresd: "{{ prometheus__scraping_kresd }}"
-  bird: "{{ prometheus__scraping_bird }}"
-  quanta: "{{ prometheus__scraping_quanta }}"
-  ilo: "{{ prometheus__scraping_ilo }}"
-  snmp: "{{ prometheus__scraping_snmp }}"
-  eaton: "{{ prometheus__scraping_eaton }}"
-  jitsi: "{{ prometheus__scraping_jitsi }}"
-
-prometheus__rules:
-  common: "{{ prometheus__rules_common }}"
-  switch: "{{ prometheus__rules_switch }}"
-  prometheus: "{{ prometheus__rules_prometheus }}"
-  node: "{{ prometheus__rules_node }}"
-  keepalived: "{{ prometheus__rules_keepalived }}"
-  quanta: "{{ prometheus__rules_quanta }}"
-  #ilo: "{{ prometheus__rules_ilo }}"
-  bird: "{{ prometheus__rules_bird }}"
-  #eaton: "{{ prometheus__rules_eaton }}"
-...
--- a/group_vars/prom/prometheus/node.yml
+++ b/group_vars/prom/prometheus/node.yml
@ -1,200 +0,0 @@
---
-prometheus__scraping_node:
-  targets: "{{ groups.vm + groups.pve }}"
-  address:
-    port: 9100
-
-prometheus__rules_node:
-  - alert: OutOfMemory
-    expr:
-      (
-        node_memory_MemFree_bytes
-        + node_memory_Cached_bytes
-        + node_memory_Buffers_bytes
-      ) / node_memory_MemTotal_bytes < 0.1
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      FreeMemory: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: HostSwapIsFillingUp
-    expr:
-      (
-        1 - (
-          node_memory_SwapFree_bytes
-          / node_memory_SwapTotal_bytes
-        )
-      ) >= 0.5
-    for: 3m
-    labels:
-      severity: critical
-    annotations:
-      UsedSwap: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: HostPhysicalComponentTooHot
-    expr:
-      node_hwmon_temp_celsius > 79
-    for: 3m
-    labels:
-      severity: critical
-    annotations:
-      Temperature: !unsafe "{{ $value | humanize }} °C"
-      Chip: !unsafe "{{ $labels.chip }}"
-      Sensor: !unsafe "{{ $labels.sensor }}"
-  - alert: HostNodeOvertemperatureAlarm
-    expr:
-      node_hwmon_temp_crit_alarm_celsius == 1
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Chip: !unsafe "{{ $labels.chip }}"
-      Sensor: !unsafe "{{ $labels.sensor }}"
-  - alert: HostRaidArrayGotInactive
-    expr:
-      node_md_state{state="inactive"} > 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Device: !unsafe "{{ $labels.device }}"
-  - alert: HostRaidDiskFailure
-    expr:
-      node_md_disks{state="failed"} > 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      severity: !unsafe "{{ $labels.md_device }}"
-  - alert: HostOomKillDetected
-    expr:
-      increase(node_vmstat_oom_kill[1m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      PID: !unsafe "{{ $value }}"
-  - alert: HostEdacCorrectableErrorsDetected
-    expr:
-      increase(node_edac_correctable_errors_total[1m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      CorrectedErrors: !unsafe "{{ $value }}"
-  - alert: HostEdacUncorrectableErrorsDetected
-    expr:
-      increase(node_edac_uncorrectable_errors_total[1m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      DetectedErrors: !unsafe "{{ $value }}"
-  - alert: OutOfDiskSpace
-    expr:
-      (
-        node_filesystem_free_bytes
-        / node_filesystem_size_bytes < 0.1
-      )
-      and on (instance, device, mountpoint) (
-        node_filesystem_readonly
-      ) == 0
-    for: 5m
-    labels:
-      severity: critical
-    annotations:
-      Mountpoint: !unsafe "{{ $labels.mountpoint }}"
-      FreeSpace: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: HostConntrackLimit
-    expr:
-      (
-        node_nf_conntrack_entries
-        / node_nf_conntrack_entries_limit
-      ) > 0.8
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      Filled: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: HostClockSkew
-    expr:
-      (
-        node_timex_offset_seconds > 0.05
-        and deriv(node_timex_offset_seconds[5m]) >= 0
-      ) or (
-        node_timex_offset_seconds < -0.05
-        and deriv(node_timex_offset_seconds[5m]) <= 0
-      )
-    for: 2m
-    labels:
-      severity: warning
-  - alert: HostClockNotSynchronising
-    expr:
-      min_over_time(node_timex_sync_status[1m]) == 0
-      and node_timex_maxerror_seconds >= 16
-    for: 2m
-    labels:
-      severity: warning
-  - alert: HostRequiresReboot
-    expr:
-      node_reboot_required > 0
-    for: 5m
-    labels:
-      severity: warning
-  - alert: OutOfInodes
-    expr:
-      node_filesystem_files_free
-      / node_filesystem_files < 0.1
-    for: 3m
-    labels:
-      severity: warning
-    annotations:
-      Mountpoint: !unsafe "{{ $labels.mountpoint }}"
-      FreeInodes: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: CpuUsage
-    expr:
-      (
-        1 - avg by (instance) (
-          irate(node_cpu_seconds_total{mode="idle"}[5m])
-        )
-      ) > 0.75
-    for: 10m
-    labels:
-      severity: warning
-    annotations:
-      Usage: !unsafe "{{ $value | humanizePercentage }}"
-  - alert: SystemdServiceFailed
-    expr:
-      node_systemd_unit_state{state="failed"} == 1
-    for: 10m
-    labels:
-      severity: warning
-    annotations:
-      Service: !unsafe "{{ $labels.name }}"
-  - alert: LoadUsage
-    expr:
-      node_load1 > 5
-    for: 2m
-    labels:
-      severity: warning
-    annotations:
-      Load1: !unsafe "{{ $value | humanize }}"
-  - alert: UnhealthyDisk
-    expr:
-      smartmon_device_smart_healthy < 1
-    for: 10m
-    labels:
-      severity: critical
-    annotations:
-      Disk: !unsafe "{{ $labels.disk }}"
-  - alert: HostCpuStealNoisyNeighbor
-    expr:
-      avg by (instance) (
-        rate(node_cpu_seconds_total{mode="steal"}[5m])
-      ) > 0.1
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      Disk: !unsafe "{{ $labels.disk }}"
-      Steal: !unsafe "{{ $value | humanizePercentage }}"
-...
--- a/group_vars/prom/prometheus/prometheus.yml
+++ b/group_vars/prom/prometheus/prometheus.yml
@ -1,14 +0,0 @@
---
-prometheus__scraping_prometheus:
-  targets: "{{ groups.prom }}"
-  address:
-    port: 9090
-
-prometheus__rules_prometheus:
-  - alert: PrometheusTsdbCompactionFailed
-    expr:
-      increase(prometheus_tsdb_compactions_failed_total[1m]) > 0
-    for: 0m
-    labels:
-      severity: critical
-...
--- a/group_vars/prom/prometheus/quanta.yml
+++ b/group_vars/prom/prometheus/quanta.yml
@ -1,98 +0,0 @@
---
-prometheus__scraping_quanta:
-  targets: "{{ groups.quanta }}"
-  address: 127.0.0.1:9116
-  path: /snmp
-  timeout: 180s
-  interval: 180s
-  params:
-    module:
-      - quanta
-
-prometheus__rules_quanta:
-  - alert: QuantaQueueOverflow
-    expr:
-      snAgGblQueueOverflow == 1
-    for: 0m
-    labels:
-      severity: critical
-  - alert: QuantaCpuUsage
-    expr:
-      snAgGblCpuUtil1MinAvg > 50
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      Usage: !unsafe "{{ $value }} %"
-  - alert: QuantaCpuUsage
-    expr:
-      snAgGblCpuUtil1MinAvg > 80
-    for: 5m
-    labels:
-      severity: critical
-    annotations:
-      Usage: !unsafe "{{ $value }} %"
-  - alert: QuantaMemoryUsage
-    expr:
-      100 * (1 - (snAgGblDynMemFree / snAgGblDynMemTotal)) > 50
-    for: 5m
-    labels:
-      severity: warning
-    annotations:
-      UsedMemory: !unsafe "{{ $value }} %"
-  - alert: QuantaMemoryUsage
-    expr:
-      100 * (1 - (snAgGblDynMemFree / snAgGblDynMemTotal)) > 80
-    for: 5m
-    labels:
-      severity: alert
-    annotations:
-      UsedMemory: !unsafe "{{ $value }} %"
-  - alert: QuantaFanHealth
-    expr:
-      snChasFanOperStatus{snChasFanOperStatus="normal"} == 0
-    for: 0m
-    labels:
-      severity: critical
-    annotations:
-      Description: !unsafe "{{ $labels.shChasFanDescription }}"
-      Status: !unsafe "{{ $labels.snChasFanOperStatus }}"
-  - alert: QuantaMissingIntakeTemp
-    expr:
-      count by (instance) (
-        snAgentTempValue
-      ) - count by (instance) (
-        snAgentTempValue{snAgentTempSensorDescr=~".*Intake.*"}
-      ) == 0
-    for: 0m
-    labels:
-      severity: critical
-  - alert: QuantaIntakeTemp
-    expr:
-      0.5 * snAgentTempValue{snAgentTempSensorDescr=~".*Intake.*"} > 60
-    for: 10m
-    keep_firing_for: 30m
-    labels:
-      severity: warning
-    annotations:
-      Temperature: !unsafe "{{ $value }} °C"
-      Description: !unsafe "{{ $labels.snAgentTempSensorDescr }}"
-  - alert: QuantaIntakeTemp
-    expr:
-      0.5 * snAgentTempValue{snAgentTempSensorDescr=~".*Intake.*"} > 70
-    for: 10m
-    keep_firing_for: 30m
-    labels:
-      severity: critical
-    annotations:
-      Temperature: !unsafe "{{ $value }} °C"
-      Description: !unsafe "{{ $labels.snAgentTempSensorDescr }}"
-  - alert: QuantaPowerRedundancyFailure
-    expr:
-      count by (instance) (
-        snChasPwrSupplyOperStatus{snChasPwrSupplyOperStatus="normal"}
-      ) < 2
-    for: 0m
-    labels:
-      severity: warning
-...
--- a/group_vars/prom/prometheus/snmp.yml
+++ b/group_vars/prom/prometheus/snmp.yml
@ -1,6 +0,0 @@
---
-prometheus__scraping_snmp:
-  targets: "{{ groups.prom }}"
-  address:
-    port: 9116
-...
--- a/group_vars/prom/prometheus/switch.yml
+++ b/group_vars/prom/prometheus/switch.yml
@ -1,91 +0,0 @@
---
-prometheus__rules_switch:
-  - alert: SwitchPromiscuousChange
-    expr:
-      changes(ifPromiscuousMode[5m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchInterfaceUpChange
-    expr:
-      changes(ifOperStatus{ifOperStatus="up"}[5m]) > 0
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchInErrors
-    expr:
-      irate(ifInErrors[5m]) / (
-        irate(ifInUcastPkts[5m])
-        + irate(ifInNUcastPkts[5m])
-      ) > 0.0001
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      ErrorRate: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchOutErrors
-    expr:
-      irate(ifOutErrors[5m]) / (
-        irate(ifOutUcastPkts[5m])
-        + irate(ifOutNUcastPkts[5m])
-      ) > 0.0001
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      ErrorRate: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchInLinkUsage
-    expr:
-      rate(ifHCInOctets[5m]) / (ifHighSpeed * 1000000 / 8) > 0.5
-    for: 5m
-    keep_firing_for: 10m
-    labels:
-      severity: warning
-    annotations:
-      Usage: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchInLinkUsage
-    expr:
-      rate(ifHCInOctets[5m]) / (ifHighSpeed * 1000000 / 8) > 0.8
-    for: 5m
-    keep_firing_for: 10m
-    labels:
-      severity: critical
-    annotations:
-      Usage: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchOutLinkUsage
-    expr:
-      rate(ifHCOutOctets[5m]) / (ifHighSpeed * 1000000 / 8) > 0.5
-    for: 5m
-    keep_firing_for: 10m
-    labels:
-      severity: warning
-    annotations:
-      Usage: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-  - alert: SwitchOutLinkUsage
-    expr:
-      rate(ifHCOutOctets[5m]) / (ifHighSpeed * 1000000 / 8) > 0.8
-    for: 5m
-    keep_firing_for: 10m
-    labels:
-      severity: warning
-    annotations:
-      Usage: !unsafe "{{ $value | humanizePercentage }}"
-      Interface: !unsafe "{{ $labels.ifName }}
-        {{ if $labels.ifAlias }}- {{ $labels.ifAlias }}{{ end }}"
-...
--- a/group_vars/prom/prometheus_snmp/eaton.yml
+++ b/group_vars/prom/prometheus_snmp/eaton.yml
@ -1,40 +0,0 @@
---
-prometheus_snmp__modules_eaton:
-  version: 1
-  auth:
-    community: "{{ vault_snmp_eaton_community }}"
-  walk:
-    - sysUpTime
-    #- upsBattery
-    - xupsInput
-    - xupsOutput
-    - xupsBypass
-    - xupsEnvironment
-    - xupsBattery
-    - xupsConfig
-  lookups:
-    - source_indexes:
-        - xupsInputPhase
-      lookup: xupsInputName
-    - source_indexes:
-        - xupsOutputPhase
-      lookup: xupsOutputName
-    - source_indexes:
-        - xupsBypassPhase
-      lookup: xupsBypassName
-  overrides:
-    upsBatteryStatus:
-      type: EnumAsStateSet
-    xupsInputId:
-      type: EnumAsStateSet
-    xupsOutputId:
-      type: EnumAsStateSet
-    xupsBypassId:
-      type: EnumAsStateSet
-    xupsOutputSource:
-      type: EnumAsStateSet
-    xupsBatteryAbmStatus:
-      type: EnumAsStateSet
-    xupsContactType:
-      type: EnumAsStateSet
-...
--- a/group_vars/prom/prometheus_snmp/ilo.yml
+++ b/group_vars/prom/prometheus_snmp/ilo.yml
@ -1,19 +0,0 @@
---
-prometheus_snmp__modules_ilo:
-  version: 3
-  timeout: 10s
-  retries: 10
-  auth:
-    security_level: authPriv
-    auth_protocol: SHA
-    username: aurore
-    password: "{{ vault_snmp_ilo_auth }}"
-    priv_protocol: AES
-    priv_password: "{{ vault_snmp_ilo_priv }}"
-  walk:
-    - sysUpTime
-    - cpqHeTemperatureTable
-  overrides:
-    cpqHeTemperatureThresholdType:
-      type: EnumAsStateSet
-...
--- a/group_vars/prom/prometheus_snmp/main.yml
+++ b/group_vars/prom/prometheus_snmp/main.yml
@ -1,6 +0,0 @@
---
-prometheus_snmp__modules:
-  quanta: "{{ prometheus_snmp__modules_quanta }}"
-  ilo: "{{ prometheus_snmp__modules_ilo }}"
-  eaton: "{{ prometheus_snmp__modules_eaton }}"
-...
--- a/group_vars/prom/prometheus_snmp/quanta.yml
+++ b/group_vars/prom/prometheus_snmp/quanta.yml
@ -1,125 +0,0 @@
---
-prometheus_snmp__modules_quanta:
-  auth:
-    community: "{{ vault_snmp_quanta_community }}"
-  timeout: 60s
-  retries: 3
-  walk:
-    - interfaces
-    - ifXTable
-    - snAgGblQueueOverflow
-    - snAgGblDynMemTotal
-    - snAgGblDynMemFree
-    - snAgGblCpuUtil1SecAvg
-    - snAgGblCpuUtil5SecAvg
-    - snAgGblCpuUtil1MinAvg
-    - sysUpTime
-    - snAgentCpuUtilPercent
-    - snAgent
-    - snChasFan
-    - snChasPwr
-    - snAgentTemp
-    - snAgentCpu
-    - snSwInfo
-    - snSwIfInfoTable
-    - dot3StatsTable
-    - dot3HCStatsTable
-    - dot3Errors
-    - dot3Tests
-    - dot3CollTable
-    - lldpLocChassisId
-    - lldpRemTable
-    - lldpLocPortTable
-    - dot1dBasePort
-  lookups:
-    - source_indexes:
-        - ifIndex
-      lookup: ifAlias
-    - source_indexes:
-        - ifIndex
-      lookup: ifDescr
-    - source_indexes:
-        - ifIndex
-      lookup: ifName
-    - source_indexes:
-        - snChasFanIndex
-      lookup: snChasFanDescription
-    - source_indexes:
-        - snAgentTempSlotNum
-        - snAgentTempSensorId
-      lookup: snAgentTempSensorDescr
-    - source_indexes:
-        - snSwIfInfoPortNum
-      lookup: snSwIfName
-    - source_indexes:
-        - snSwIfInfoPortNum
-      lookup: snSwIfDescr
-    - source_indexes:
-        - dot3StatsIndex
-      lookup: ifAlias
-    - source_indexes:
-        - dot3StatsIndex
-      lookup: ifDescr
-    - source_indexes:
-        - dot3StatsIndex
-      lookup: ifName
-    - source_indexes:
-        - lldpRemTimeMark
-        - lldpRemLocalPortNum
-        - lldpRemIndex
-      lookup: lldpRemChassisId
-    #- source_indexes:
-    #    - lldpLocPortNum
-    #  lookup: lldpLocPortIdSubtype
-  overrides:
-    ifIndex:
-      ignore: true
-    ifAlias:
-      ignore: true
-    ifDescr:
-      ignore: true
-    ifName:
-      ignore: true
-    ifOperStatus:
-      type: EnumAsStateSet
-    ifAdminStatus:
-      type: EnumAsStateSet
-    snChasFanIndex:
-      ignore: true
-    snChasFanDescription:
-      ignore: true
-    snChasPwrSupplyIndex:
-      ignore: true
-    snAgentTempSensorDescr:
-      ignore: true
-    snChasFanOperStatus:
-      type: EnumAsStateSet
-    snChasPwrSupplyOperStatus:
-      type: EnumAsStateSet
-    snSwIfName:
-      ignore: true
-    snSwIfDescr:
-      ignore: true
-    snSwIfVlanId:
-      ignore: true
-    snSwIfInfoPortNum:
-      ignore: true
-    snSwIfInfoMonitorMode:
-      type: EnumAsStateSet
-    snSwIfInfoMirrorPorts:
-      ignore: true
-    snSwIfInfoMediaType:
-      type: EnumAsInfo
-    ifType:
-      type: EnumAsInfo
-    dot3StatsIndex:
-      ignore: true
-    dot3StatsEtherChipSet:
-      ignore: true
-    dot3StatsDuplexStatus:
-      type: EnumAsStateSet
-    lldpLocPortIdSubtype:
-      type: EnumAsInfo
-    lldpRemPortIdSubtype:
-      type: EnumAsInfo
-...
--- a/group_vars/pve/pve_auth.yml
+++ b/group_vars/pve/pve_auth.yml
@ -1,31 +0,0 @@
---
-pve_auth__groups:
-  admin:
-    - Administrator
-
-pve_auth__pam_users:
-  root:
-    enabled: false
-
-pve_auth__users:
-  elkmaennchen:
-    password: "{{ vault_pve_passwords.elkmaennchen }}"
-    groups:
-      - admin
-  jeltz:
-    password: "{{ vault_pve_passwords.jeltz }}"
-    groups:
-      - admin
-  korenstin:
-    password: "{{ vault_pve_passwords.korenstin }}"
-    groups:
-      - admin
-  otthorn:
-    password: "{{ vault_pve_passwords.otthorn }}"
-    groups:
-      - admin
-  v-lafeychine:
-    password: "{{ vault_pve_passwords['v-lafeychine'] }}"
-    groups:
-      - admin
-...
--- a/group_vars/radius/freeradius.yml
+++ b/group_vars/radius/freeradius.yml
@ -1,17 +0,0 @@
---
-radiusd__guest_vlan: 1000
-
-radiusd__clients:
-  localhost:
-    addr: 127.0.0.1
-    secret: abcdef
-    type: aurore
-  wifi-ap-v4:
-    addr: 10.102.0.0/16
-    secret: abcdef
-    type: aurore
-  wifi-ap-v6:
-    addr: 2a09:6840:102::/56
-    secret: abcdef
-    type: aurore
-...
--- a/group_vars/router/prometheus.yml
+++ b/group_vars/router/prometheus.yml
@ -1,3 +0,0 @@
---
-prometheus_keepalived__dest: /var/run/prometheus-node-exporter/keepalived.prom
-... 
--- a/group_vars/switch.yml
+++ b/group_vars/switch.yml
@ -1,12 +0,0 @@
---
-glob_switch:
-  loop_protect:
-    port_disable_timer_in_seconds: 30
-    transmit_interval_in_seconds: 3
-  sntp:
-    operation_mode: SNTP_UNICAST_MODE
-    poll_interval: 720
-    servers:
-      - ip: 10.206.1.5
-        priority: 1
-...
--- a/group_vars/vpn/bird.yml
+++ b/group_vars/vpn/bird.yml
@ -1,60 +0,0 @@
---
-bird__tables:
-  - wg
-
-bird__kernel:
-  kernel:
-    learn: true
-    import: accept
-    export: accept
-  vrf:
-    learn: true
-    import:
-      sources:
-        - "{{ iproute2__custom_protos.wireguard }}"
-    export: accept
-    table: wg
-    kernel: "{{ iproute2__custom_tables.wireguard }}"
-
-bird__ospf:
-  limits:
-    import: 4000
-    export: 4000
-  table: wg
-  import: accept
-  export:
-    sources:
-      - "{{ iproute2__custom_protos.wireguard }}"
-  areas:
-    1:
-      broadcast:
-        - vpn0
-
-bird__bgp:
-  infra1:
-    local:
-      address: "{{ bird__bgp_addr.vpn }}"
-      as: "{{ bird__as.aurore }}"
-    neighbor:
-      address:
-        - 2a09:6840:213::1:1
-        - 10.213.1.1
-      as: "{{ bird__as.aurore }}"
-    table: wg
-    import: accept
-    export: reject
-    next_hop_self: true
-  infra2:
-    local:
-      address: "{{ bird__bgp_addr.vpn }}"
-      as: "{{ bird__as.aurore }}"
-    neighbor:
-      address:
-        - 2a09:6840:213::1:2
-        - 10.213.1.2
-      as: "{{ bird__as.aurore }}"
-    table: wg
-    import: accept
-    export: reject
-    next_hop_self: true
-...
--- a/group_vars/vpn/ifupdown2.yml
+++ b/group_vars/vpn/ifupdown2.yml
@ -1,16 +0,0 @@
---
-ifupdown2__vrf:
-  wg-vrf:
-    table: "{{ iproute2__custom_tables.wireguard }}"
-
-ifupdown2__wireguard:
-  wg0:
-    private_key: "{{ vault_wireguard_wg0_private }}"
-    listen_port: 5121
-    vrf: wg-vrf
-    table: "{{ iproute2__custom_tables.wireguard }}"
-    peer_allowed_addresses:
-      - 2a09:6840:212::1:1/128
-      - 10.212.1.1/32
-    peer_public_key: 0kP/XjaGOpu4p9KHTAoAhkLwXzC8wJUdPIdhdpgeKhY=
-...
--- a/group_vars/vpn/iproute2.yml
+++ b/group_vars/vpn/iproute2.yml
@ -1,7 +0,0 @@
---
-iproute2__custom_tables:
-  wireguard: 2000
-
-iproute2__custom_protos:
-  wireguard: 200
-...
--- a/host_vars/caradoc.adm.auro.re.yml
+++ b/host_vars/caradoc.adm.auro.re.yml
@ -1,12 +0,0 @@
---
-borg_keep_hourly: 6
-borg_keep_daily: 7
-borg_keep_weekly: 4
-borg_keep_monthly: 12
-borg_backup_directories:
-  - "/etc"
-  - "/var"
-  - "/data_nextcloud"
-  - "/data_gitea"
-  - "/data_mail"
-...
--- a/host_vars/collabora.ext.infra.auro.re.yml
+++ b/host_vars/collabora.ext.infra.auro.re.yml
@ -1,22 +0,0 @@
---
-systemd_link__links:
-  pub0: ae:ae:ae:2C:60:35
-
-ifupdown2__interfaces:
-  pub0:
-    addresses:
-      - 2a09:6840:128::220/64
-      - 10.128.0.220/16
-    gateways: "{{ ifupdown2__gateways.adm }}"
-
-collabora__server_name: office.auro.re
-
-collabora__post_allow_addrs:
-  - 2a09:6840:215::1:1
-  - 45.66.111.206
-
-collabora__wopi_groups:
-  - host: https://cloud.auro.re:443
-    aliases:
-      - https://nextcloud.auro.re:443
-...
--- a/host_vars/dhcp-1.isp.infra.auro.re.yml
+++ b/host_vars/dhcp-1.isp.infra.auro.re.yml
@ -1,47 +0,0 @@
---
-systemd_link__links:
-  isp0: 02:00:00:c6:3f:6f
-  trunk0: 02:00:00:b1:8d:d6
-
-ifupdown2__interfaces:
-  isp0:
-    addresses:
-      - 2a09:6840:210::1:1/64
-      - 10.210.1.1/16
-    gateways: "{{ ifupdown2__gateways.isp }}"
-  trunk0:
-    ipv6_addrgen: false
-  clients0:
-    bridge_vlan_aware: true
-    bridge_ports:
-      - trunk0
-    bridge_vids:
-      - 1000-1004
-    bridge_disable_pvid: true
-    ipv6_addrgen: false
-  client0:
-    addresses:
-      - 100.64.0.2/27
-    vlan_id: 1000
-    vlan_raw_device: clients0
-  client1:
-    addresses:
-      - 100.64.0.34/27
-    vlan_id: 1001
-    vlan_raw_device: clients0
-  client2:
-    addresses:
-      - 100.64.0.66/27
-    vlan_id: 1002
-    vlan_raw_device: clients0
-  client3:
-    addresses:
-      - 100.64.0.98/27
-    vlan_id: 1003
-    vlan_raw_device: clients0
-  client4:
-    addresses:
-      - 100.64.0.130/27
-    vlan_id: 1004
-    vlan_raw_device: clients0
-...
--- a/host_vars/dhcp-2.isp.infra.auro.re.yml
+++ b/host_vars/dhcp-2.isp.infra.auro.re.yml
@ -1,47 +0,0 @@
---
-systemd_link__links:
-  isp0: 04:00:00:8c:d1:36
-  trunk0: 04:00:00:33:2c:3c
-
-ifupdown2__interfaces:
-  isp0:
-    addresses:
-      - 2a09:6840:210::1:2/64
-      - 10.210.1.2/16
-    gateways: "{{ ifupdown2__gateways.isp }}"
-  trunk0:
-    ipv6_addrgen: false
-  clients0:
-    bridge_vlan_aware: true
-    bridge_ports:
-      - trunk0
-    bridge_vids:
-      - 1000-1004
-    bridge_disable_pvid: true
-    ipv6_addrgen: false
-  client0:
-    addresses:
-      - 100.64.0.3/27
-    vlan_id: 1000
-    vlan_raw_device: clients0
-  client1:
-    addresses:
-      - 100.64.0.35/27
-    vlan_id: 1001
-    vlan_raw_device: clients0
-  client2:
-    addresses:
-      - 100.64.0.67/27
-    vlan_id: 1002
-    vlan_raw_device: clients0
-  client3:
-    addresses:
-      - 100.64.0.99/27
-    vlan_id: 1003
-    vlan_raw_device: clients0
-  client4:
-    addresses:
-      - 100.64.0.131/27
-    vlan_id: 1004
-    vlan_raw_device: clients0
-...
--- a/host_vars/dns-1.int.infra.auro.re.yml
+++ b/host_vars/dns-1.int.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  int0: 02:00:00:9f:d9:f9
-
-ifupdown2__interfaces:
-  int0:
-    addresses:
-      - 2a09:6840:206::1:1/64
-      - 10.206.1.1/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/dns-2.int.infra.auro.re.yml
+++ b/host_vars/dns-2.int.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  int0: 04:00:00:3c:c0:5a
-
-ifupdown2__interfaces:
-  int0:
-    addresses:
-      - 2a09:6840:206::1:2/64
-      - 10.206.1.2/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/edge-1.back.infra.auro.re.yml
+++ b/host_vars/edge-1.back.infra.auro.re.yml
@ -1,39 +0,0 @@
---
-systemd_link__links:
-  adm0: 02:00:00:9E:3E:21
-  crans0: 02:00:00:A2:7C:68
-  zayo0: 02:00:00:35:89:82
-  rezel0: 02:00:00:8F:4A:AD
-  back0: 02:00:00:1C:3A:2E
-  viarezo0: 02:00:00:ED:70:64
-  router0: 02:00:00:5A:17:7C
-  oti0: 02:00:00:05:0E:A6
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:2/64
-      - 10.128.10.2/16
-  crans0:
-    ipv6_addrgen: false
-  zayo0:
-    ipv6_addrgen: false
-  rezel0:
-    addresses:
-      - 2a09:6842:19:9116::1/64
-      - 45.66.111.1/29
-  back0:
-    addresses:
-      - 2a09:6840:203::1:1/64
-      - 10.203.1.1/16
-  viarezo0:
-    addresses:
-      - 2a0c:b641:2ff::6/125
-      - 192.159.121.133/29
-  router0:
-    addresses:
-      - 2a09:6840:129::10:2/56
-      - 10.129.10.2/16
-  oti0:
-    ipv6_addrgen: false
-...
--- a/host_vars/edge-2.back.infra.auro.re.yml
+++ b/host_vars/edge-2.back.infra.auro.re.yml
@ -1,39 +0,0 @@
---
-systemd_link__links:
-  adm0: 04:00:00:F5:69:B9
-  crans0: 04:00:00:CF:E1:D0
-  zayo0: 04:00:00:67:7B:12
-  rezel0: 04:00:00:C6:05:B7
-  back0: 04:00:00:DE:22:E6
-  viarezo0: 04:00:00:45:FA:E6
-  router0: 04:00:00:AD:D7:71
-  oti0: 02:00:00:05:0E:A6
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:102/64
-      - 10.128.10.102/16
-  crans0:
-    ipv6_addrgen: false
-  zayo0:
-    ipv6_addrgen: false
-  rezel0:
-    addresses:
-      - 2a09:6842:19:9116::3/64
-      - 45.66.111.3/29
-  back0:
-    addresses:
-      - 2a09:6840:203::1:2/64
-      - 10.203.1.2/16
-  viarezo0:
-    addresses:
-      - 2a0c:b641:2ff::7/125
-      - 192.159.121.134/29
-  router0:
-    addresses:
-      - 2a09:6840:129::10:102/56
-      - 10.129.10.102/16
-  oti0:
-    ipv6_addrgen: false
-...
--- a/host_vars/infra-1.back.infra.auro.re.yml
+++ b/host_vars/infra-1.back.infra.auro.re.yml
@ -1,63 +0,0 @@
---
-systemd_link__links:
-  ups0: 02:00:00:fe:6f:0e
-  back0: 02:00:00:f8:93:22
-  monit0: 02:00:00:da:97:7f
-  wifi0: 02:00:00:8c:c5:bf
-  int0: 02:00:00:75:40:3e
-  sw0: 02:00:00:ca:e8:d1
-  bmc0: 02:00:00:47:d1:b9
-  pve0: 02:00:00:b3:35:e7
-  isp0: 02:00:00:6b:53:14
-  ext0: 02:00:00:32:86:60
-  vpn0: 02:00:00:52:5f:85
-  th30: 02:00:00:23:a7:d3
-  pub0: 02:00:00:7d:34:06
-
-ifupdown2__interfaces:
-  back0:
-    addresses:
-      - 2a09:6840:203::1:3/64
-      - 10.203.1.3/16
-      - 45.66.111.210/32 # secondary
-  ups0:
-    ipv6_addrgen: false
-  monit0:
-    ipv6_addrgen: false
-  wifi0:
-    ipv6_addrgen: false
-  int0:
-    ipv6_addrgen: false
-  sw0:
-    ipv6_addrgen: false
-  bmc0:
-    ipv6_addrgen: false
-  pve0:
-    ipv6_addrgen: false
-  isp0:
-    ipv6_addrgen: false
-  ext0:
-    ipv6_addrgen: false
-  pub0:
-    ipv6_addrgen: false
-  vpn0:
-    addresses:
-      - 2a09:6840:213::1:1/64
-      - 10.213.1.1/16
-  th30:
-    ipv6_addrgen: false
-
-bird__router_id: 10.203.1.3
-
-bird__bgp_addr:
-  back:
-    - 2a09:6840:203::1:3
-    - 10.203.1.3
-  vpn:
-    - 2a09:6840:213::1:1
-    - 10.213.1.1
-
-bird__pref_src_addr:
-  - 2a09:6840:203::1:3
-  - 45.66.111.210
-...
--- a/host_vars/infra-2.back.infra.auro.re.yml
+++ b/host_vars/infra-2.back.infra.auro.re.yml
@ -1,63 +0,0 @@
---
-systemd_link__links:
-  ups0: 04:00:00:6d:97:83
-  back0: 04:00:00:46:ba:f9
-  monit0: 04:00:00:72:0b:2d
-  wifi0: 04:00:00:ee:42:0f
-  int0: 04:00:00:21:fd:d0
-  sw0: 04:00:00:2e:5b:16
-  bmc0: 04:00:00:bb:5a:a6
-  pve0: 04:00:00:0b:2b:82
-  isp0: 04:00:00:f4:4c:5d
-  ext0: 04:00:00:1d:0e:83
-  vpn0: 04:00:00:02:ba:dd
-  th30: 04:00:00:9e:8d:4f
-  pub0: 04:00:00:f8:3b:9b
-
-ifupdown2__interfaces:
-  back0:
-    addresses:
-      - 2a09:6840:203::1:4/64
-      - 10.203.1.4/16
-      - 45.66.111.211/32 # secondary
-  ups0:
-    ipv6_addrgen: false
-  monit0:
-    ipv6_addrgen: false
-  wifi0:
-    ipv6_addrgen: false
-  int0:
-    ipv6_addrgen: false
-  sw0:
-    ipv6_addrgen: false
-  bmc0:
-    ipv6_addrgen: false
-  pve0:
-    ipv6_addrgen: false
-  isp0:
-    ipv6_addrgen: false
-  ext0:
-    ipv6_addrgen: false
-  vpn0:
-    addresses:
-      - 2a09:6840:213::1:2/64
-      - 10.213.1.2/16
-  th30:
-    ipv6_addrgen: false
-  pub0:
-    ipv6_addrgen: false
-
-bird__router_id: 10.203.1.4
-
-bird__bgp_addr:
-  back:
-    - 2a09:6840:203::1:4
-    - 10.203.1.4
-  vpn:
-    - 2a09:6840:213:1:2
-    - 10.213.1.2
-
-bird__pref_src_addr:
-  - 2a09:6840:203::1:4
-  - 45.66.111.211
-...
--- a/host_vars/isp-1.back.infra.auro.re.yml
+++ b/host_vars/isp-1.back.infra.auro.re.yml
@ -1,59 +0,0 @@
---
-systemd_link__links:
-  adm0: 02:00:00:D8:37:45
-  back0: 02:00:00:BF:10:4C
-  trunk0: 02:00:00:E9:BA:15
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:5/64
-      - 10.128.10.5/16
-    gateways: "{{ ifupdown2__gateways.adm }}"
-  back0:
-    addresses:
-      - 2a09:6840:203::1:5/64
-      - 45.66.111.211/32
-      - 10.203.1.5/16
-  trunk0:
-    ipv6_addrgen: false
-  clients0:
-    bridge_vlan_aware: true
-    bridge_ports:
-      - trunk0
-    bridge_vids:
-      - 1000-1004
-    bridge_disable_pvid: true
-    ipv6_addrgen: false
-  client0:
-    vlan_id: 1000
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client1:
-    vlan_id: 1001
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client2:
-    vlan_id: 1002
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client3:
-    vlan_id: 1003
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client4:
-    vlan_id: 1004
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-
-bird__router_id: 10.203.1.5
-
-bird__bgp_addr:
-  back:
-    - 2a09:6840:203::1:5
-    - 10.203.1.5
-
-bird__pref_src_addr:
-  - 2a09:6840:203::1:5
-  - 45.66.111.211
-...
--- a/host_vars/isp-2.back.infra.auro.re.yml
+++ b/host_vars/isp-2.back.infra.auro.re.yml
@ -1,47 +0,0 @@
---
-systemd_link__links:
-  adm0: 04:00:00:85:C3:5D
-  back0: 04:00:00:FE:2D:67
-  trunk0: 04:00:00:D8:F5:4D
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:105/64
-      - 10.128.10.105/16
-    gateways: "{{ ifupdown2__gateways.adm }}"
-  back0:
-    addresses:
-      - 2a09:6840:203::1:6/64
-      - 10.203.1.6/16
-  trunk0:
-    ipv6_addrgen: false
-  clients0:
-    bridge_vlan_aware: true
-    bridge_ports:
-      - trunk0
-    bridge_vids:
-      - 1000-1004
-    bridge_disable_pvid: true
-    ipv6_addrgen: false
-  client0:
-    vlan_id: 1000
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client1:
-    vlan_id: 1001
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client2:
-    vlan_id: 1002
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client3:
-    vlan_id: 1003
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-  client4:
-    vlan_id: 1004
-    vlan_raw_device: clients0
-    ipv6_addrgen: false
-...
--- a/host_vars/ldap-1.int.infra.auro.re.yml
+++ b/host_vars/ldap-1.int.infra.auro.re.yml
@ -1,16 +0,0 @@
---
-systemd_link__links:
-  adm0: 02:00:00:38:c2:52
-  int0: 02:00:00:fe:a8:54
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:8/64
-      - 10.128.10.8/16
-  int0:
-    addresses:
-      - 2a09:6840:206::1:3/64
-      - 10.206.1.7/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/ldap-2.int.infra.auro.re.yml
+++ b/host_vars/ldap-2.int.infra.auro.re.yml
@ -1,16 +0,0 @@
---
-systemd_link__links:
-  adm0: 04:00:00:f7:1c:47
-  int0: 04:00:00:e4:83:d2
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::10:108/64
-      - 10.128.10.108/16
-  int0:
-    addresses:
-      - 2a09:6840:206::1:4/64
-      - 10.206.1.8/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/log.adm.auro.re.yml
+++ b/host_vars/log.adm.auro.re.yml
@ -1,16 +0,0 @@
---
-borg_backup_directories:
-  - "/etc/"
-  - "/var/"
-borg_backup_exclude: []
-
-rsyslog_collector_base_dir: /var/log/remote
-rsyslog_inputs:
-  - proto: relp
-    port: 20514
-  - proto: udp
-    port: 514
-  - proto: tcp
-    port: 6514
-rsyslog_outputs: []
-...
--- a/host_vars/mx.test.infra.auro.re.yml
+++ b/host_vars/mx.test.infra.auro.re.yml
@ -1,38 +0,0 @@
---
-dovecot__auth_default_realm: test.auro.re
-dovecot__auth_users:
-  jeltz@test.auro.re: "{plain}password"
-  lafeych@test.auro.re: "{plain}password"
-  toto@test.auro.re: "{plain}password"
-  root@test.auro.re: "{plain}L9yXSrCbbafMlMls5q7WWMKC612XNbXL"
-dovecot__lmtp_postmaster_address: postmaster@test.auro.re
-
-ifupdown2__interfaces:
-  ext0:
-    addresses:
-      - 2a09:6840:211::1:5/64
-      - 10.211.1.5/16
-      - 45.66.111.208/30
-    gateways: "{{ ifupdown2__gateways.ext }}"
-
-postfix__hostname: mx.test.auro.re
-
-postfix__sasl_local_domain: test.auro.re
-
-postfix__virtual_aliases:
-  postmaster@test.auro.re: root@test.auro.re
-  dmarc@test.auro.re: root@test.auro.re
-
-postfix__virtual_mailbox_domains:
- - infra.test.auro.re
- - test.auro.re
-
-postfix__virtual_mailboxes:
-  jeltz@test.auro.re: jeltz@test.auro.re
-  root@test.auro.re: root@test.auro.re
-  toto@test.auro.re: toto@test.auro.re
-  vincent.lafeychine@test.auro.re: lafeych@test.auro.re
-
-systemd_link__links:
-  ext0: ae:ae:ae:1d:c8:b2
-...
--- a/host_vars/ns-1.pub.infra.auro.re.yml
+++ b/host_vars/ns-1.pub.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  pub0: 02:00:00:ad:62:64
-
-ifupdown2__interfaces:
-  pub0:
-    addresses:
-      - 2a09:6840:215::1:2/64
-      - 45.66.111.205/27
-    gateways: "{{ ifupdown2__gateways.pub }}"
-...
--- a/host_vars/ns-2.pub.infra.auro.re.yml
+++ b/host_vars/ns-2.pub.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  pub0: 04:00:00:1b:0a:3a
-
-ifupdown2__interfaces:
-  pub0:
-    addresses:
-      - 2a09:6840:215::1:3/64
-      - 45.66.111.207/27
-    gateways: "{{ ifupdown2__gateways.pub }}"
-...
--- a/host_vars/ns-3.ovh.infra.auro.re.yml
+++ b/host_vars/ns-3.ovh.infra.auro.re.yml
@ -1,29 +0,0 @@
---
-systemd_link__links:
-  adm0: 96:77:96:91:e3:6c
-  ovh0: 02:00:00:97:78:6d
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::109/64
-      - 10.128.0.109/16
-  ovh0:
-    addresses:
-      - 92.222.211.194/24
-    gateways: "{{ ifupdown2__gateways.ovh }}"
-
-# TODO: remove as soon as the VPN works
-knotd__remotes:
-  xfr-master:
-    address: 2a09:6840:128::110
-    key: xfr
-
-knotd__acl:
-  notify-master:
-    address:
-      - 2a09:6840:128::110
-      - 10.128.0.110
-    key: xfr
-    action: notify
-...
--- a/host_vars/ns-master.int.infra.auro.re/knotd.yml
+++ b/host_vars/ns-master.int.infra.auro.re/knotd.yml
@ -1,617 +0,0 @@
---
-knotd__listen:
-  - address: 0.0.0.0
-  - address: "::"
-
-knotd__keys:
-  xfr:
-    algorithm: hmac-sha512
-    secret: "{{ vault_knotd_xfr_key }}"
-  ksk-infra:
-    algorithm: hmac-sha512
-    secret: "{{ vault_knotd_ksk_infra_key }}"
-  update-acme-challenge:
-    algorithm: hmac-sha512
-    secret: "{{ vault_certbot_dns_secret }}"
-
-knotd__remotes:
-  xfr-ns-1:
-    address: 2a09:6840:215::1:2
-    key: xfr
-  xfr-ns-2:
-    address: 2a09:6840:215::1:3
-    key: xfr
-  xfr-ns-3:
-    address: 10.128.0.109
-    key: xfr
-  ksk-infra:
-    address: ::1
-    key: ksk-infra
-
-knotd__policies:
-  public:
-    algorithm: ECDSAP256SHA256
-    reproducible_signing: true
-    # Je n'ai pas trouvé de façon de pousser les records automatiquement
-    # sur .re, donc pour éviter d'oublier de le faire manuellement, la
-    # KSK n'expire pas
-    ksk_lifetime: 0
-    zsk_lifetime: 30d
-    nsec3: true
-  infra:
-    algorithm: ECDSAP256SHA256
-    ksk_lifetime: 365d
-    zsk_lifetime: 30d
-    nsec3: on
-    ds-push: ksk-infra
-    cds-cdnskey-publish: rollover
-    ksk-submission: infra
-  ripe:
-    algorithm: ECDSAP256SHA256
-    ksk_lifetime: 365d
-    zsk_lifetime: 30d
-    nsec3: on
-    ds-push: ksk-ripe
-    cds-cdnskey-publish: rollover
-    ksk-submission: ripe
-
-knotd__acl:
-  xfr:
-    addresses:
-      - 2a09:6840:128::109
-      - 10.128.0.109
-      - 2a09:6840:215::1:2
-      - 45.66.111.205
-      - 2a09:6840:215::1:3
-      - 45.66.111.207
-    action: transfer
-    key: xfr
-  ksk-infra:
-    addresses:
-      - 127.0.0.1
-      - ::1
-    key: ksk-infra
-    action: update
-    update_types:
-      - DS
-    update_owner: name
-    update_owner_match: equal
-    update_owner_name:
-      - infra
-  update-acme-challenge:
-    addresses:
-      - 10.128.0.0/16
-      - 2a09:6840:128::/48
-    key: update-acme-challenge
-    action: update
-    update_types:
-      - TXT
-    update_owner: name
-    update_owner_match: equal
-    update_owner_name:
-      - _acme-challenge.auro.re.
-
-knotd__queryacl:
-  local:
-    addresses:
-      - 10.0.0.0/8
-
-knotd__soa_rname: root@auro.re.
-
-knotd__hosts:
-  auro.re:
-    proxy-ovh:
-      - 92.222.211.195
-    horus:
-      - 92.23.218.136
-    ns-1:
-      - 45.66.111.205
-      - 2a09:6840:215::1:2
-    ns-2:
-      - 92.222.211.194
-    serge:
-      - 92.222.211.196
-    lama:
-      - 185.230.78.220
-      - 2a0c:700:12:0:67:e5ff:fee9:108
-    vpn-ovh:
-      - 92.222.211.197
-    passerelle:
-      - 45.66.111.254
-      - 2a09:6840:111::254
-    proxy:
-      - 45.66.111.61
-      - 2a09:6840:111::61
-    camelot:
-      - 45.66.111.59
-      - 2a09:6840:111::59
-    mail:
-      - 45.66.111.62
-      - 2a09:6840:111::62
-    galene:
-      - 45.66.111.65
-      - 2a09:6840:111::65
-    aclyas:
-      - 45.66.111.231
-      - 2a09:6840:111::231
-    jitsi:
-      - 45.66.111.55
-      - 2a09:6840:111::55
-    jitsi-ng:
-      - 45.66.111.216
-      - 2a09:6840:215::1:216
-    portail-fleming:
-      - 10.13.0.247
-      - 2a09:6840:13::247
-    portail-pacaterie:
-      - 10.23.0.247
-      - 2a09:6840:23::247
-    portail-rives:
-      - 10.33.0.247
-      - 2a09:6840:33::247
-    portail-edc:
-      - 10.43.0.247
-      - 2a09:6840:43::247
-    portail-gs:
-      - 10.53.0.247
-      - 2a09:6840:53::247
-
-  adh.auro.re:
-    paon:
-      - 45.66.110.10
-      - 2a09:6840:110:0:231:92ff:fe1b:ae22
-    lyshyga0:
-      - 45.66.110.113
-      - 2a09:6840:110:0:6af7:28ff:fe91:e8d9
-    pz28910:
-      - 45.66.110.114
-    vinsing0:
-      - 45.66.110.123
-      - 2a09:6840:110:0:1e1b:dff:fe90:7d81
-    osc-routeur:
-      - 45.66.110.125
-      - 2a09:6840:110:0:ba27:ebff:fe2d:c1a1
-    odroid:
-      - 45.66.110.154
-      - 2a09:6840:110:0:21e:6ff:fe49:e00
-    amau0:
-      - 45.66.110.164
-      - 2a09:6840:110:0:3e7c:3fff:fec3:27d1
-    regulus:
-      - 45.66.110.180
-      - 2a09:6840:110:0:2ef0:5dff:fe2a:1530
-    toaster:
-      - 45.66.110.188
-      - 2a09:6840:110:0:5246:5dff:fe9a:f70
-    rpijutax:
-      - 45.66.110.190
-      - 2a09:6840:110:0:ba27:ebff:fe76:a9bc
-    polaris:
-      - 45.66.110.245
-      - 2a09:6840:110:0:dea6:32ff:feb4:d033
-    lafeychine:
-      - 92.91.154.45
-
-  infra.auro.re:
-    services-1.ceph:
-      - 2a09:6840:214::1:1
-      - 10.214.1.1
-    services-2.ceph:
-      - 2a09:6840:214::1:2
-      - 10.214.1.2
-    services-3.ceph:
-      - 2a09:6840:209::1:3
-      - 10.214.1.3
-    services-1.pve:
-      - 2a09:6840:209::2:1
-      - 10.209.2.1
-    services-2.pve:
-      - 2a09:6840:209::2:2
-      - 10.209.2.2
-    network-1.pve:
-      - 2a09:6840:209::1:1
-      - 10.209.1.1
-    network-2.pve:
-      - 2a09:6840:209::1:2
-      - 10.209.1.2
-    services-3.pve:
-      - 2a09:6840:209::2:3
-      - 10.209.2.3
-    caradoc.bmc:
-      - 2a09:6840:208::1:1
-      - 10.208.1.1
-    services-1.bmc:
-      - 2a09:6840:208::1:2
-      - 10.208.1.2
-    services-2.bmc:
-      - 2a09:6840:208::1:3
-      - 10.208.1.3
-    services-3.bmc:
-      - 2a09:6840:208::1:4
-      - 10.208.1.4
-    perceval.bmc:
-      - 2a09:6840:208::1:5
-      - 10.208.1.5
-    chapalux.bmc:
-      - 2a09:6840:208::1:6
-      - 10.208.1.6
-    loki.bmc:
-      - 2a09:6840:208::1:7
-      - 10.208.1.7
-    network-1.bmc:
-      - 2a09:6840:208::1:8
-      - 10.208.1.8
-    network-2.bmc:
-      - 2a09:6840:208::1:9
-      - 10.208.1.9
-    escalope.bmc:
-      - 2a09:6840:208::1:10
-      - 10.208.1.10
-    edge-1.back:
-      - 2a09:6840:203::1:1
-      - 10.203.1.1
-    edge-2.back:
-      - 2a09:6840:203::1:2
-      - 10.203.1.2
-    isp-1.back:
-      - 2a09:6840:203::1:5
-      - 10.203.1.5
-    isp-2.back:
-      - 2a09:6840:203::1:6
-      - 10.203.1.6
-    infra-1.back:
-      - 2a09:6840:203::1:3
-      - 10.203.1.3
-    infra-2.back:
-      - 2a09:6840:203::1:4
-      - 10.203.1.4
-    ns-master.int:
-      - 2a09:6840:128:0::110
-      - 10.128.0.110
-    log-1.int:
-      - 2a09:6840:206::1:9
-      - 10.206.1.9
-    log-2.int:
-      - 2a09:6840:206::1:10
-      - 10.206.1.10
-    dns-1.int:
-      - 2a09:6840:206::1:1
-      - 10.206.1.1
-    dns-2.int:
-      - 2a09:6840:206::1:2
-      - 10.206.1.2
-    nis2.int:
-      - 2a09:6840:206::2:1
-      - 10.206.2.1
-    ldap-1.int:
-      - 10.128.10.8
-      - 2a09:6840:128::10:8
-    ldap-2.int:
-      - 10.128.10.108
-      - 2a09:6840:128::10:108
-    ntp-1.int:
-      - 2a09:6840:206::1:5
-      - 10.206.1.5
-    ntp-2.int:
-      - 2a09:6840:206::1:6
-      - 10.206.1.6
-    wg-1.vpn:
-      - 2a09:6840:213::1:3
-      - 10.213.1.3
-    wg-2.vpn:
-      - 2a09:6840:213::1:4
-      - 10.213.1.4
-    dhcp-1.isp:
-      - 2a09:6840:210::1:1
-      - 10.210.1.1
-    dhcp-2.isp:
-      - 2a09:6840:210::1:2
-      - 10.210.1.2
-    radius-1.isp:
-      - 2a09:6840:210::1:3
-      - 10.210.1.3
-    radius-2.isp:
-      - 2a09:6840:210::1:4
-      - 10.210.1.4
-    prometheus-1.monit:
-      - 2a09:6840:204::1:1
-      - 10.204.1.1
-    prometheus-2.monit:
-      - 2a09:6840:204::1:2
-      - 10.204.1.2
-    ff-1.core.sw:
-      - 10.207.1.1
-    ff-2.core.sw:
-      - 10.207.1.2
-    fl-1.core.sw:
-      - 10.207.1.3
-    fl-2.core.sw:
-      - 10.207.1.4
-    fd-1.core.sw:
-      - 10.207.1.5
-    ff-3.core.sw:
-      - 10.207.1.6
-    gk-1.core.sw:
-      - 10.207.2.1
-    eb-1.core.sw:
-      - 10.207.3.1
-    r3-1.core.sw:
-      - 10.207.4.1
-    eb-1.ups:
-      - 2a09:6840:201::3:1
-      - 10.201.3.1
-    ec-1.ups:
-      - 2a09:6840:201::3:2
-      - 10.201.3.2
-    mx.test:
-      - 2a09:6840:211::1:5
-      - 10.211.1.5
-    collabora.ext:
-      - 2a09:6840:211::1:1
-      - 10.211.1.1
-    grafana.ext:
-      - 2a09:6840:211::1:7
-      - 10.211.1.7
-    proxy.pub:
-      - 2a09:6840:215::1:1
-      - 45.66.111.206
-    ns-1.pub:
-      - 2a09:6840:215::1:2
-      - 45.66.111.205
-    ns-2.pub:
-      - 2a09:6840:215::1:3
-      - 45.66.111.207
-    ns-3.ovh:
-      - 92.222.211.194
-    tor.pub:
-      - 45.66.111.215
-      - 2a09:6840:215::1:215
-    jitsi.pub:
-      - 45.66.111.216
-      - 2a09:6840:215::1:216
-
-knotd__zones:
-  auro.re:
-    dnssec_policy: public
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - update-acme-challenge
-      - ksk-infra
-      - xfr
-    soa:
-      mname: ns-master.int.infra
-    ns:
-      - target:
-          - ns-1.pub.infra
-          - ns-2.pub.infra
-      - name: infra
-        target:
-          - ns-1.pub.infra
-          - ns-2.pub.infra
-      - name: test
-        target:
-          - ns-1.pub.infra
-          - ns-2.pub.infra
-      - name: adm
-        target:
-          - serge
-          - lama
-      - name: ups
-        target:
-          - serge
-          - lama
-      - name: switch
-        target:
-          - serge
-          - lama
-      - name: borne
-        target:
-          - serge
-          - lama
-    mx:
-      - exchange: mail
-        preference: 5
-      - exchange: proxy-ovh
-        preference: 10
-    txt:
-      - data: v=spf1 mx -all
-    a:
-      - address: 92.222.211.195
-    cname:
-      - name:
-          - gisti
-          - gistiti
-        target: jitsi
-      - name:
-          - element
-          - riot
-          - auth
-          - rss
-          - codimd
-          - hedgedoc
-          - grist
-          - kanboard
-          - www
-          - pad
-          - privatebin
-          - zero
-          - paste
-        target: proxy-ovh
-      - name:
-          - grafana
-          - grafana-ng
-          - nextcloud
-          - cloud
-          - office
-        target: proxy.pub.infra
-      - name:
-          - netbox
-          - wiki
-          - matrix
-          - drone
-          - gitea
-          - re2o
-          - vote
-        target: proxy
-      - name: intranet
-        target: re2o
-      - name:
-          - smtp
-          - imap
-        target: mail
-      - name:
-          - prometheus-paul.adh
-          - pma-paul.adh
-          - nextcloud-paul.adh
-          - grafana-paul.adh
-          - jellyfin.adh
-          - monitoring.adh
-          - beta-mpp.adh
-          - pz28.adh
-        target: lucepaul.myvnc.com.
-      - name:
-          - services-1.pve
-        target: services-1.pve.infra
-      - name:
-          - services-2.pve
-        target: services-2.pve.infra
-      - name:
-          - services-3.pve
-        target: services-3.pve.infra
-    hosts: "{{ knotd__hosts['auro.re']
-               | combine(knotd__hosts['adh.auro.re']
-                         | add_origin_keys('adh.auro.re.')) }}"
-  test.auro.re:
-    dnssec_policy: public
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    txt:
-      - data: v=spf1 mx -all
-      - name: _dmarc
-        data: v=DMARC1;p=quarantine;pct=100;rua=mailto:postmaster@test.auro.re;ruf=mailto:postmaster@test.auro.re
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-    mx:
-      - exchange: mx
-        preference: 5
-    cname:
-      - name:
-          - www1
-          - www2
-          - www3
-        target: proxy.pub.infra.auro.re.
-    hosts:
-      mx:
-        - 2a09:6840:211::1:5
-        - 45.66.111.205
-  infra.auro.re:
-    dnssec_policy: infra
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    #queryacl: local
-    soa:
-      mname: ns-master.int
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-    hosts: "{{ knotd__hosts['infra.auro.re'] }}"
-
-  108.66.45.in-addr.arpa:
-    dnssec_policy: ripe
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-  109.66.45.in-addr.arpa:
-    dnssec_policy: ripe
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-  110.66.45.in-addr.arpa:
-    dnssec_policy: ripe
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-    reverse_hosts: "{{ knotd__hosts['adh.auro.re']
-                       | ip_filter(['45.66.110.0/24'])
-                       | add_origin_keys('adh.auro.re.') }}"
-  111.66.45.in-addr.arpa:
-    dnssec_policy: ripe
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-    reverse_hosts: "{{ knotd__hosts['auro.re']
-                       | ip_filter(['45.66.111.0/24'])
-                       | add_origin_keys('auro.re.') }}"
-  0.4.8.6.9.0.a.2.ip6.arpa:
-    dnssec_policy: ripe
-    notify:
-      - xfr-ns-1
-      - xfr-ns-2
-      - xfr-ns-3
-    acl:
-      - xfr
-    soa:
-      mname: ns-master.int.infra.auro.re.
-    ns:
-      - target:
-          - ns-1.pub.infra.auro.re.
-          - ns-2.pub.infra.auro.re.
-    reverse_hosts: "{{ knotd__hosts['auro.re']
-                       | ip_filter(['2a09:6840::/32'])
-                       | add_origin_keys('auro.re.')
-                       | combine(knotd__hosts['adh.auro.re']
-                                 | ip_filter(['2a09:6840::/32'])
-                                 | add_origin_keys('adh.auro.re.')) }}"
-...
--- a/host_vars/ns-master.int.infra.auro.re/main.yml
+++ b/host_vars/ns-master.int.infra.auro.re/main.yml
@ -1,16 +0,0 @@
---
-systemd_link__links:
-  int0: 02:00:00:e3:36:c8
-  adm0: 42:17:a7:d1:bd:6a
-
-ifupdown2__interfaces:
-  adm0:
-    addresses:
-      - 2a09:6840:128::110/64
-      - 10.128.0.110/16
-  int0:
-    addresses:
-      - 2a09:6840:206::1:7/64
-      - 10.206.1.7/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/ntp-1.int.infra.auro.re.yml
+++ b/host_vars/ntp-1.int.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  int0: 02:00:00:74:71:83
-
-ifupdown2__interfaces:
-  int0:
-    addresses:
-      - 2a09:6840:206::1:5/64
-      - 10.206.1.5/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/ntp-2.int.infra.auro.re.yml
+++ b/host_vars/ntp-2.int.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  int0: 04:00:00:31:be:50
-
-ifupdown2__interfaces:
-  int0:
-    addresses:
-      - 2a09:6840:206::1:6/64
-      - 10.206.1.6/16
-    gateways: "{{ ifupdown2__gateways.int }}"
-...
--- a/host_vars/perceval.adm.auro.re.yml
+++ b/host_vars/perceval.adm.auro.re.yml
@ -1,3 +0,0 @@
---
-borg_server_backups_dir: /borg
-...
--- a/host_vars/prometheus-1.monit.infra.auro.re.yml
+++ b/host_vars/prometheus-1.monit.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  monit0: 02:00:00:a8:6b:51
-
-ifupdown2__interfaces:
-  monit0:
-    addresses:
-      - 2a09:6840:204::1:1/64
-      - 10.204.1.1/16
-    gateways: "{{ ifupdown2__gateways.monit }}"
-...
--- a/host_vars/prometheus-2.monit.infra.auro.re.yml
+++ b/host_vars/prometheus-2.monit.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  monit0: 04:00:00:a6:93:5a
-
-ifupdown2__interfaces:
-  monit0:
-    addresses:
-      - 2a09:6840:204::1:2/64
-      - 10.204.1.2/16
-    gateways: "{{ ifupdown2__gateways.monit }}"
-...
--- a/host_vars/proxy-ovh.adm.auro.re.yml
+++ b/host_vars/proxy-ovh.adm.auro.re.yml
@ -13,8 +13,6 @@ loc_reverseproxy:
      to: auro.re
    - from: 92.222.211.195
      to: auro.re
-    - from: codimd.auro.re
-      to: hedgedoc.auro.re

  reverseproxy_sites:
    - from: phabricator.auro.re
@ -29,9 +27,6 @@ loc_reverseproxy:
    - from: passbolt.auro.re
      to: 10.128.0.53

-    - from: auth.auro.re
-      to: 10.128.0.150:8089
-
    - from: riot.auro.re
      to: "10.128.0.150:8080"
    - from: element.auro.re
@ -39,6 +34,8 @@ loc_reverseproxy:
    - from: chat.auro.re
      to: "10.128.0.150:8080"

+    - from: codimd.auro.re
+      to: "10.128.0.150:8081"
    - from: hedgedoc.auro.re
      to: "10.128.0.150:8081"

@ -59,8 +56,6 @@ loc_reverseproxy:

    - from: cas.auro.re
      to: "10.128.0.150:8085"
-    - from: rss.auro.re
-      to: 10.128.0.150:8090
    - from: status.auro.re
      to: "10.128.0.150:8086"
    - from: "kanboard.auro.re"
--- a/host_vars/proxy.adm.auro.re.yml
+++ b/host_vars/proxy.adm.auro.re.yml
@ -70,6 +70,3 @@ loc_reverseproxy:

    - from: grafana.auro.re
      to: "10.128.0.98:3000"
-
-    - from: office.auro.re
-      to: "10.128.0.220"
--- a/host_vars/proxy.pub.infra.auro.re.yml
+++ b/host_vars/proxy.pub.infra.auro.re.yml
@ -1,103 +0,0 @@
---
-systemd_link__links:
-  pub0: ae:ae:ae:3a:71:0b
-
-ifupdown2__interfaces:
-  pub0:
-    addresses:
-      - 2a09:6840:215::1:1/64
-      - 45.66.111.206/27
-    gateways: "{{ ifupdown2__gateways.pub }}"
-
-caddy__matrix_headers:
-  access-control-allow-headers: "Origin, X-Requested-With, Content-Type, Accept, Authorization"
-  access-control-allow-methods: "GET, POST, PUT, DELETE, OPTIONS"
-  access-control-allow-origin: "*"
-
-caddy__routes_https:
-  www1.test.auro.re:
-    - root: /var/www/auro.re
-    - path: /.well-known/matrix/server
-      headers: "{{ caddy__matrix_headers }}"
-      body: '{"m.server": "matrix.auro.re:8448"}'
-      status: 200
-    - path: /.well-known/matrix/client
-      headers: "{{ caddy__matrix_headers }}"
-      body: '{"m.homeserver": {"base_url": "https://matrix.auro.re"}}'
-      status: 200
-  www2.test.auro.re:
-    headers:
-      location: "https://auro.re{http.request.uri}"
-    status: 301
-  www3.test.auro.re:
-    reverse:
-      - "[2a09:6840:128::198]:3000"
-      - 10.128.0.198:3000
-  grafana.auro.re:
-    reverse:
-      - "[2a09:6840:128::98]:3000"
-      - 10.128.0.98:3000
-  grafana-ng.auro.re:
-    reverse:
-      - "[2a09:6840:211::1:7]:80"
-      - 10.211.1.7:80
-  office.auro.re:
-    reverse:
-      - "[2a09:6840:211::1:1]:9980"
-      - 10.211.1.1:9980
-  nextcloud.auro.re:
-    headers:
-      location: "https://cloud.auro.re{http.request.uri}"
-    status: 301
-  cloud.auro.re:
-    - path: /.well-known/carddav
-      headers:
-        location: /remote.php/dav/
-      status: 301
-    - path: /.well-known/caldav
-      headers:
-        location: /remote.php/dav/
-      status: 301
-    - path: /.well-known/webfinger
-      headers:
-        location: /index.php/.well-known/webfinger
-      status: 301
-    - path: /.well-known/nodeinfo
-      headers:
-        location: /index.php/.well-known/nodeinfo
-      status: 301
-    - path: /remote/*
-      rewrite: /remote.php
-    - path: /ocm-provider/*
-      rewrite: /index.php
-    - path: "*.mjs"
-      headers:
-        content-type: text/javascript
-    - reverse:
-        - "[2a09:6840:128::58]:8080"
-        - 10.128.0.58:8080
-      headers:
-        x-robots-tag: noindex, nofollow
-        referrer-policy: no-referrer
-        x-content-type-options: nosniff
-        x-frame-options: SAMEORIGIN
-        x-permitted-cross-domain-policies: none
-        x-xss-protection: "1; mode=block"
-
-caddy__contact_email: tech.aurore@lists.crans.org
-
-caddy__errors:
-  - root: "{{ caddy__error_dir }}"
-  - rewrite: /error.html
-  - file_server: true
-    templates: true
-
-caddy__servers:
-  https:
-    listen: ":443"
-    routes: "{{ caddy__routes_https }}"
-    errors: "{{ caddy__errors }}"
-  http:
-    listen: ":80"
-
-...
--- a/host_vars/radius-1.isp.infra.auro.re.yml
+++ b/host_vars/radius-1.isp.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  isp0: 02:00:00:6a:3e:f4
-
-ifupdown2__interfaces:
-  isp0:
-    addresses:
-      - 2a09:6840:210::1:3/64
-      - 10.210.1.3/16
-    gateways: "{{ ifupdown2__gateways.isp }}"
-...
--- a/host_vars/radius-2.isp.infra.auro.re.yml
+++ b/host_vars/radius-2.isp.infra.auro.re.yml
@ -1,11 +0,0 @@
---
-systemd_link__links:
-  isp0: 04:00:00:29:6d:c9
-
-ifupdown2__interfaces:
-  isp0:
-    addresses:
-      - 2a09:6840:210::1:4/64
-      - 10.210.1.4/16
-    gateways: "{{ ifupdown2__gateways.isp }}"
-...
--- a/host_vars/sw-ec-1.yml
+++ b/host_vars/sw-ec-1.yml
@ -1,93 +0,0 @@
---
-switch_vars:
-  name: sw-ec-1
-  location: "Local_de_Brassage_EdC"
-  host: 10.130.4.11
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 40
-      name: "Filaire_EDC"
-      tagged: "{{ '9-10,12,14,16,18,20,22-25' | range2list }}"
-    - id: 41
-      name: "Wifi_EDC"
-      tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}"
-    - id: 42
-      name: "Banni_EDC"
-      tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}"
-    - id: 43
-      name: "Accueil_EDC"
-      tagged: "{{ '5-10,12,14,16,18,20,22-25' | range2list }}"
-    - id: 110
-      name: "Adherents_IP_Publiques"
-      tagged: "{{ '9-10,12,14,16,18,20,22-25' | range2list }}"
-    - id: 111
-      name: "Serveurs_IP_Publiques"
-      tagged: "{{ '25' | range2list }}"
-    - id: 131
-      name: "Onduleurs"
-      tagged: [25]
-    - id: 144
-      name: "Bornes_Wifi_EDC"
-      tagged: [25]
-      untagged: "{{ '5-8,12,14,16,18,20,22-24' | range2list }}"
-  ports:
-    - id: 1
-      name: "Room_Ouest_363"
-    - id: 2
-      name: "Room_Ouest_364"
-    - id: 3
-      name: "Room_Principale_Foyer_1"
-    - id: 4
-      name: "Room_Principale_Foyer_2"
-    - id: 5
-      name: "Borne_Principale_0_1"
-    - id: 6
-      name: "Borne_Principale_1_1"
-    - id: 7
-      name: "Borne_Principale_1_2"
-    - id: 8
-      name: "Borne_Principale_1_3"
-    - id: 9
-      name: "Room_Ouest_352"
-    - id: 10
-      name: "Borne_Adh_Ouest_252"
-    - id: 11
-      name: "Room_Ouest_273"
-    - id: 12
-      name: "Borne_Adh_Est_231"
-    - id: 13
-      name: "Room_Ouest_261"
-    - id: 14
-      name: "Borne_Adh_Ouest_272"
-    - id: 15
-      name: "Room_Ouest_262"
-    - id: 16
-      name: "Room_Est_225"
-    - id: 17
-      name: "Room_Ouest_263"
-    - id: 18
-      name: "Room_Ouest_76"
-    - id: 19
-      name: "Room_Ouest_264"
-    - id: 20
-      name: "Borne_Adh_Ouest_58"
-    - id: 21
-      name: "Room_Ouest_265"
-    - id: 22
-      name: "Not_used"
-    - id: 23
-      name: "Room_Ouest_158"
-    - id: 24
-      name: "Borne_Adh_Ouest_267"
-    # id: 25
-    # name: "Uplink_sw-ec-core"
-    - id: 26
-      name: "Not_used"
-    - id: 27
-      name: "Not_used"
-    - id: 28
-      name: "Not_used"
-...
--- a/host_vars/sw-ec-2.yml
+++ b/host_vars/sw-ec-2.yml
@ -1,228 +0,0 @@
---
-switch_vars:
-  name: sw-ec-2
-  location: Local de Brassage EdC
-  host: 10.130.4.12
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 40
-      name: "Filaire_edc"
-      tagged: [49]
-    - id: 41
-      name: "Wifi_edc"
-      tagged: [49]
-    - id: 42
-      name: "Banni_edc"
-      tagged: [49]
-    - id: 43
-      name: "Accueil_edc"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 111
-      name: "Serveurs_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 144
-      name: "Bornes_wifi_edc"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_edc_Aile_Principale_115"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_edc_Aile_Principale_103"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_edc_Aile_Principale_114"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_edc_Aile_Principale_102"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_edc_Aile_Principale_113"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_edc_Aile_Principale_101"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_edc_Aile_Principale_112"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_edc_Aile_Principale_100"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_edc_Aile_Principale_111"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_edc_Aile_Principale_215"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_edc_Aile_Principale_110"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_edc_Aile_Principale_214"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_edc_Aile_Principale_207"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_edc_Aile_Est_24"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_edc_Aile_Principale_206"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_edc_Aile_Est_25"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_edc_Aile_Principale_205"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_edc_Aile_Est_26"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_edc_Aile_Principale_204"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_edc_Aile_Est_27"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_edc_Aile_Principale_203"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_edc_Aile_Est_28"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_edc_Aile_Principale_202"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_edc_Aile_Est_29"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_edc_Aile_Principale_201"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_edc_Aile_Est_30"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_edc_Aile_Principale_200"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_edc_Aile_Est_31"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_edc_Aile_Est_20"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_edc_Aile_Est_32"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_edc_Aile_Est_21"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_edc_Aile_Est_33"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_edc_Aile_Est_22"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_edc_Aile_Est_34"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_edc_Aile_Est_23"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_edc_Aile_Est_120"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_edc_Aile_Principale_109"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_edc_Aile_Principale_213"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_edc_Aile_Principale_108"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_edc_Aile_Principale_212"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_edc_Aile_Principale_107"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_edc_Aile_Principale_211"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_edc_Aile_Principale_106"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_edc_Aile_Principale_210"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_edc_Aile_Principale_105"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_edc_Aile_Principale_209"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_edc_Aile_Principale_104"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_edc_Aile_Principale_208"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-ec-3.yml
+++ b/host_vars/sw-ec-3.yml
@ -1,220 +0,0 @@
---
-switch_vars:
-  name: sw-ec-3
-  location: Local de Brassage EdC
-  host: 10.130.4.13
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 40
-      name: "Filaire_edc"
-      tagged: [49]
-    - id: 41
-      name: "Wifi_edc"
-      tagged: [49]
-    - id: 42
-      name: "Banni_edc"
-      tagged: [49]
-    - id: 43
-      name: "Accueil_edc"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 111
-      name: "Serveurs_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 144
-      name: "Bornes_wifi_edc"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_edc_Aile_Est_121"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_edc_Aile_Est_133"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_edc_Aile_Est_122"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_edc_Aile_Est_134"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_edc_Aile_Est_123"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_edc_Aile_Est_135"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_edc_Aile_Est_124"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_edc_Aile_Est_136"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_edc_Aile_Est_125"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_edc_Aile_Est_137"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_edc_Aile_Est_126"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_edc_Aile_Est_138"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_edc_Aile_Est_237"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_edc_Aile_Est_226"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_edc_Aile_Est_238"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_edc_Aile_Est_227"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_edc_Aile_Est_239"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_edc_Aile_Est_228"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_edc_Aile_Est_333"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_edc_Aile_Est_229"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_edc_Aile_Est_332"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_edc_Aile_Est_331"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_edc_Aile_Est_231"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_edc_Aile_Est_330"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_edc_Aile_Est_232"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_edc_Aile_Est_329"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_edc_Aile_Est_233"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_edc_Aile_Est_328"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_edc_Aile_Est_234"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_edc_Aile_Est_327"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_edc_Aile_Est_235"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_edc_Aile_Est_326"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_edc_Aile_Est_236"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_edc_Aile_Est_325"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_edc_Aile_Est_127"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_edc_Aile_Est_139"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_edc_Aile_Est_128"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_edc_Aile_Est_220"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_edc_Aile_Est_129"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_edc_Aile_Est_221"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_edc_Aile_Est_130"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_edc_Aile_Est_222"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_edc_Aile_Est_131"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_edc_Aile_Est_223"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_edc_Aile_Est_132"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_edc_Aile_Est_224"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-ec-4.yml
+++ b/host_vars/sw-ec-4.yml
@ -1,224 +0,0 @@
---
-switch_vars:
-  name: sw-ec-4
-  location: Local de Brassage EdC
-  host: 10.130.4.14
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 40
-      name: "Filaire_edc"
-      tagged: [49]
-    - id: 41
-      name: "Wifi_edc"
-      tagged: [49]
-    - id: 42
-      name: "Banni_edc"
-      tagged: [49]
-    - id: 43
-      name: "Accueil_edc"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 111
-      name: "Serveurs_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 144
-      name: "Bornes_wifi_edc"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_edc_Aile_Est_324"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_edc_Aile_Ouest_57"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_edc_Aile_Est_323"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Not_used"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_edc_Aile_Est_322"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_edc_Aile_Ouest_59"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_edc_Aile_Est_321"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_edc_Aile_Ouest_60"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_edc_Aile_Est_320"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_edc_Aile_Ouest_61"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_edc_Aile_Ouest_50"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_edc_Aile_Ouest_62"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_edc_Aile_Ouest_69"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_edc_Aile_Ouest_153"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_edc_Aile_Ouest_70"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_edc_Aile_Ouest_154"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_edc_Aile_Ouest_71"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_edc_Aile_Ouest_155"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_edc_Aile_Ouest_72"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_edc_Aile_Ouest_156"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_edc_Aile_Ouest_73"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_edc_Aile_Ouest_157"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_edc_Aile_Ouest_74"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_edc_Aile_Ouest_75"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_edc_Aile_Ouest_159"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_edc_Aile_Ouest_76"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_edc_Aile_Ouest_160"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_edc_Aile_Ouest_77"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_edc_Aile_Ouest_161"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_edc_Aile_Ouest_150"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_edc_Aile_Ouest_162"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_edc_Aile_Ouest_151"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_edc_Aile_Ouest_163"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_edc_Aile_Ouest_152"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_edc_Aile_Ouest_164"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_edc_Aile_Ouest_51"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_edc_Aile_Ouest_63"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_edc_Aile_Ouest_52"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_edc_Aile_Ouest_64"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_edc_Aile_Ouest_53"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_edc_Aile_Ouest_65"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_edc_Aile_Ouest_54"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_edc_Aile_Ouest_66"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_edc_Aile_Ouest_55"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_edc_Aile_Ouest_67"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_edc_Aile_Ouest_56"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_edc_Aile_Ouest_68"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-ec-5.yml
+++ b/host_vars/sw-ec-5.yml
@ -1,224 +0,0 @@
---
-switch_vars:
-  name: sw-ec-5
-  location: Local de Brassage EdC
-  host: 10.130.4.15
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 40
-      name: "Filaire_edc"
-      tagged: [49]
-    - id: 41
-      name: "Wifi_edc"
-      tagged: [49]
-    - id: 42
-      name: "Banni_edc"
-      tagged: [49]
-    - id: 43
-      name: "Accueil_edc"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 111
-      name: "Serveurs_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 144
-      name: "Bornes_wifi_edc"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_edc_Aile_Ouest_165"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_edc_Aile_Ouest_177"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_edc_Aile_Ouest_166"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_edc_Aile_Ouest_250"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_edc_Aile_Ouest_167"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_edc_Aile_Ouest_251"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_edc_Aile_Ouest_168"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Not_used"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_edc_Aile_Ouest_169"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Machine_ups-ec-2.ups.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_edc_Aile_Ouest_170"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_edc_Aile_Ouest_254"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_edc_Aile_Ouest_357"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_edc_Aile_Est_230"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_edc_Aile_Ouest_358"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_edc_Aile_Ouest_274"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_edc_Aile_Ouest_359"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_edc_Aile_Ouest_275"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_edc_Aile_Ouest_360"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_edc_Aile_Ouest_276"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_edc_Aile_Ouest_361"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_edc_Aile_Ouest_277"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_edc_Aile_Ouest_362"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_edc_Aile_Ouest_350"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Not_used"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_edc_Aile_Ouest_351"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_edc_Aile_Ouest_268"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_edc_Aile_Ouest_253"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_edc_Aile_Ouest_269"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_edc_Aile_Ouest_353"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_edc_Aile_Ouest_270"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_edc_Aile_Ouest_354"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_edc_Aile_Ouest_271"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_edc_Aile_Ouest_355"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_edc_Aile_Ouest_356"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_edc_Aile_Ouest_171"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_edc_Aile_Ouest_255"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_edc_Aile_Ouest_172"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_edc_Aile_Ouest_256"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_edc_Aile_Ouest_173"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_edc_Aile_Ouest_257"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_edc_Aile_Ouest_174"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_edc_Aile_Ouest_258"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_edc_Aile_Ouest_175"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_edc_Aile_Ouest_259"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_edc_Aile_Ouest_176"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_edc_Aile_Ouest_260"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fa-1.yml
+++ b/host_vars/sw-fa-1.yml
@ -1,54 +0,0 @@
---
-switch_vars:
-  name: sw-fa-1
-  location: Fleming
-  host: 10.130.1.51
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [25]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: "{{ '1-5,25' | range2list }}"
-    - id: 12
-      name: "Banni_fleming"
-      tagged: "{{ '1-5,25' | range2list }}"
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: "{{ '1-5,25' | range2list }}"
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [25]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [25]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [25]
-      untagged: "{{ '1-5' | range2list }}"
-  ports:
-    - id: 1
-      name: "Machine_fa-0-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Machine_fa-1-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Machine_fa-2-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Machine_fa-3-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Machine_fa-4-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fa-2.yml
+++ b/host_vars/sw-fa-2.yml
@ -1,145 +0,0 @@
---
-switch_vars:
-  name: sw-fa-2
-  location: Fleming
-  host: 10.130.1.52
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [49]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: [49]
-    - id: 12
-      name: "Banni_fleming"
-      tagged: [49]
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_1_Bat_11A_409"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_1_Bat_11A_410"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_1_Bat_11A_411"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_1_Bat_11A_412"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_1_Bat_11A_001"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_1_Bat_11A_002"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_1_Bat_11A_002"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_1_Bat_11A_003"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_1_Bat_11A_004"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_1_Bat_11A_005"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_1_Bat_11A_006"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_1_Bat_11A_007"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_1_Bat_11A_008"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_Fleming_Village_1_Bat_11A_009"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_Fleming_Village_1_Bat_11A_010"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_Fleming_Village_1_Bat_11A_011"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_Fleming_Village_1_Bat_11A_J02"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_Fleming_Village_1_Bat_11A_J02"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_Fleming_Village_1_Bat_11A_J03"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_Fleming_Village_1_Bat_11A_J04"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_Fleming_Village_1_Bat_11A_J05"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_Fleming_Village_1_Bat_11A_J06"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_Fleming_Village_1_Bat_11A_J07"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_Fleming_Village_1_Bat_11A_J08"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_Fleming_Village_1_Bat_11A_J09"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_Fleming_Village_1_Bat_11A_J10"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_Fleming_Village_1_Bat_11A_J11"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_Fleming_Village_1_Bat_11A_J01"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fa-3.yml
+++ b/host_vars/sw-fa-3.yml
@ -1,225 +0,0 @@
---
-switch_vars:
-  name: sw-fa-3
-  location: Fleming
-  host: 10.130.1.53
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [49]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: [49]
-    - id: 12
-      name: "Banni_fleming"
-      tagged: [49]
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_1_Bat_11A_101"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_1_Bat_11A_102g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_1_Bat_11A_102d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_1_Bat_11A_103"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_1_Bat_11A_104"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_1_Bat_11A_105"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_1_Bat_11A_106"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_1_Bat_11A_107"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_1_Bat_11A_108"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_1_Bat_11A_109"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_1_Bat_11A_110"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_1_Bat_11A_111"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_1_Bat_11A_112"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_Fleming_Village_1_Bat_11A_201"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_Fleming_Village_1_Bat_11A_202g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_Fleming_Village_1_Bat_11A_202d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_Fleming_Village_1_Bat_11A_203"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_Fleming_Village_1_Bat_11A_204"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_Fleming_Village_1_Bat_11A_205"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_Fleming_Village_1_Bat_11A_206"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_Fleming_Village_1_Bat_11A_207"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_Fleming_Village_1_Bat_11A_208"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_Fleming_Village_1_Bat_11A_209"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_Fleming_Village_1_Bat_11A_210"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_Fleming_Village_1_Bat_11A_211"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_Fleming_Village_1_Bat_11A_212"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_Fleming_Village_1_Bat_11A_301"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_Fleming_Village_1_Bat_11A_302g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_Fleming_Village_1_Bat_11A_302d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_Fleming_Village_1_Bat_11A_303"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_Fleming_Village_1_Bat_11A_304"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_Fleming_Village_1_Bat_11A_305"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_Fleming_Village_1_Bat_11A_306"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_Fleming_Village_1_Bat_11A_307"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_Fleming_Village_1_Bat_11A_308"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_Fleming_Village_1_Bat_11A_309"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_Fleming_Village_1_Bat_11A_310"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_Fleming_Village_1_Bat_11A_311"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_Fleming_Village_1_Bat_11A_312"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_Fleming_Village_1_Bat_11A_401"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_Fleming_Village_1_Bat_11A_402g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_Fleming_Village_1_Bat_11A_402d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_Fleming_Village_1_Bat_11A_403"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_Fleming_Village_1_Bat_11A_404"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_Fleming_Village_1_Bat_11A_405"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_Fleming_Village_1_Bat_11A_406"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_Fleming_Village_1_Bat_11A_407"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_Fleming_Village_1_Bat_11A_408"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fb-1.yml
+++ b/host_vars/sw-fb-1.yml
@ -1,118 +0,0 @@
---
-switch_vars:
-  name: sw-fb-1
-  location: Fleming
-  host: 10.130.1.61
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [25]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: "{{ '17-21,25' | range2list }}"
-    - id: 12
-      name: "Banni_fleming"
-      tagged: "{{ '17-21,25' | range2list }}"
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: "{{ '17-21,25' | range2list }}"
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [25]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [25]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [25]
-      untagged: "{{ '17-21' | range2list }}"
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_1_Bat_12B_409"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_1_Bat_12B_410"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_1_Bat_12B_411"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_1_Bat_12B_412"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_1_Bat_12B_001"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_1_Bat_12B_002g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_1_Bat_12B_002d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_1_Bat_12B_003"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_1_Bat_12B_004"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_1_Bat_12B_005"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_1_Bat_12B_006"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_1_Bat_12B_007"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_1_Bat_12B_008"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_Fleming_Village_1_Bat_12B_009"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_Fleming_Village_1_Bat_12B_010"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_Fleming_Village_1_Bat_12B_011"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Machine_fb-0-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Machine_fb-1-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Machine_fb-2-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Machine_fb-3-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Machine_fb-4-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fb-2.yml
+++ b/host_vars/sw-fb-2.yml
@ -1,225 +0,0 @@
---
-switch_vars:
-  name: sw-fb-2
-  location: Fleming
-  host: 10.130.1.62
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [49]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: [49]
-    - id: 12
-      name: "Banni_fleming"
-      tagged: [49]
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_1_Bat_12B_101"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_1_Bat_12B_102g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_1_Bat_12B_102d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_1_Bat_12B_103"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_1_Bat_12B_104"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_1_Bat_12B_105"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_1_Bat_12B_106"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_1_Bat_12B_107"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_1_Bat_12B_108"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_1_Bat_12B_109"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_1_Bat_12B_110"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_1_Bat_12B_111"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_1_Bat_12B_112"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_Fleming_Village_1_Bat_12B_201"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_Fleming_Village_1_Bat_12B_202g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_Fleming_Village_1_Bat_12B_202d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_Fleming_Village_1_Bat_12B_203"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_Fleming_Village_1_Bat_12B_204"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_Fleming_Village_1_Bat_12B_205"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_Fleming_Village_1_Bat_12B_206"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_Fleming_Village_1_Bat_12B_207"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_Fleming_Village_1_Bat_12B_208"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_Fleming_Village_1_Bat_12B_209"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_Fleming_Village_1_Bat_12B_210"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_Fleming_Village_1_Bat_12B_211"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_Fleming_Village_1_Bat_12B_212"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_Fleming_Village_1_Bat_12B_301"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_Fleming_Village_1_Bat_12B_302g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_Fleming_Village_1_Bat_12B_302d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_Fleming_Village_1_Bat_12B_303"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_Fleming_Village_1_Bat_12B_304"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_Fleming_Village_1_Bat_12B_305"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_Fleming_Village_1_Bat_12B_306"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_Fleming_Village_1_Bat_12B_307"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_Fleming_Village_1_Bat_12B_308"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_Fleming_Village_1_Bat_12B_309"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_Fleming_Village_1_Bat_12B_310"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_Fleming_Village_1_Bat_12B_311"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_Fleming_Village_1_Bat_12B_312"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_Fleming_Village_1_Bat_12B_401"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_Fleming_Village_1_Bat_12B_402g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_Fleming_Village_1_Bat_12B_402d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_Fleming_Village_1_Bat_12B_403"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_Fleming_Village_1_Bat_12B_404"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_Fleming_Village_1_Bat_12B_405"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_Fleming_Village_1_Bat_12B_406"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_Fleming_Village_1_Bat_12B_407"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_Fleming_Village_1_Bat_12B_408"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fc-1.yml
+++ b/host_vars/sw-fc-1.yml
@ -1,106 +0,0 @@
---
-switch_vars:
-  name: sw-fc-1
-  location: Fleming
-  host: 10.130.1.71
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [25]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: "{{ '15-19,25' | range2list }}"
-    - id: 12
-      name: "Banni_fleming"
-      tagged: "{{ '15-19,25' | range2list }}"
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: "{{ '15-19,25' | range2list }}"
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [25]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [25]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [25]
-      untagged: "{{ '15-19' | range2list }}"
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_Bat13C_401"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_Bat13C_402g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_Bat13C_402d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_Bat13C_403"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_Bat13C_404"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_Bat13C_405"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_Bat13C_406"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_Bat13C_407"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_Bat13C_408"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_Bat13C_409"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_Bat13C_410"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_Bat13C_411"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_Bat13C_412"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Machine_fc-0-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Machine_fc-1-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Machine_fc-2-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Machine_fc-3-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Machine_fc-4-1.borne.auro.re"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/host_vars/sw-fc-2.yml
+++ b/host_vars/sw-fc-2.yml
@ -1,225 +0,0 @@
---
-switch_vars:
-  name: sw-fc-2
-  location: Fleming
-  host: 10.130.1.72
-  port: 80
-  username: "{{ vault_switch.username }}"
-  password: "{{ vault_switch.password }}"
-  delete_vlans: []
-  vlans:
-    - id: 10
-      name: "Filaire_fleming"
-      tagged: [49]
-    - id: 11
-      name: "Wifi_fleming"
-      tagged: [49]
-    - id: 12
-      name: "Banni_fleming"
-      tagged: [49]
-    - id: 13
-      name: "Accueil_fleming"
-      tagged: [49]
-    - id: 110
-      name: "Adherents_ip_publiques"
-      tagged: [49]
-    - id: 131
-      name: "Onduleurs"
-      tagged: [49]
-    - id: 141
-      name: "Bornes_fleming"
-      tagged: [49]
-  ports:
-    - id: 1
-      name: "Room_Fleming_Village_1_Bat_13C_001"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 2
-      name: "Room_Fleming_Village_1_Bat_13C_002"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 3
-      name: "Room_Fleming_Village_1_Bat_13C_003"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 4
-      name: "Room_Fleming_Village_1_Bat_13C_004"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 5
-      name: "Room_Fleming_Village_1_Bat_13C_005"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 6
-      name: "Room_Fleming_Village_1_Bat_13C_006"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 7
-      name: "Room_Fleming_Village_1_Bat_13C_007"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 8
-      name: "Room_Fleming_Village_1_Bat_13C_008"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 9
-      name: "Room_Fleming_Village_1_Bat_13C_009"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 10
-      name: "Room_Fleming_Village_1_Bat_13C_101"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 11
-      name: "Room_Fleming_Village_1_Bat_13C_102g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 12
-      name: "Room_Fleming_Village_1_Bat_13C_102d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 13
-      name: "Room_Fleming_Village_1_Bat_13C_103"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 14
-      name: "Room_Fleming_Village_1_Bat_13C_104"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 15
-      name: "Room_Fleming_Village_1_Bat_13C_105"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 16
-      name: "Room_Fleming_Village_1_Bat_13C_106"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 17
-      name: "Room_Fleming_Village_1_Bat_13C_107"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 18
-      name: "Room_Fleming_Village_1_Bat_13C_108"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 19
-      name: "Room_Fleming_Village_1_Bat_13C_109"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 20
-      name: "Room_Fleming_Village_1_Bat_13C_110"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 21
-      name: "Room_Fleming_Village_1_Bat_13C_111"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 22
-      name: "Room_Fleming_Village_1_Bat_13C_112"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 23
-      name: "Room_Fleming_Village_1_Bat_13C_201"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 24
-      name: "Room_Fleming_Village_1_Bat_13C_202g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 25
-      name: "Room_Fleming_Village_1_Bat_13C_202d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 26
-      name: "Room_Fleming_Village_1_Bat_13C_203"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 27
-      name: "Room_Fleming_Village_1_Bat_13C_204"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 28
-      name: "Room_Fleming_Village_1_Bat_13C_205"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 29
-      name: "Room_Fleming_Village_1_Bat_13C_206"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 30
-      name: "Room_Fleming_Village_1_Bat_13C_207"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 31
-      name: "Room_Fleming_Village_1_Bat_13C_208"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 32
-      name: "Room_Fleming_Village_1_Bat_13C_209"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 33
-      name: "Room_Fleming_Village_1_Bat_13C_210"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 34
-      name: "Room_Fleming_Village_1_Bat_13C_211"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 35
-      name: "Room_Fleming_Village_1_Bat_13C_212"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 36
-      name: "Room_Fleming_Village_1_Bat_13C_301"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 37
-      name: "Room_Fleming_Village_1_Bat_13C_302g"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 38
-      name: "Room_Fleming_Village_1_Bat_13C_302d"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 39
-      name: "Room_Fleming_Village_1_Bat_13C_303"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 40
-      name: "Room_Fleming_Village_1_Bat_13C_304"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 41
-      name: "Room_Fleming_Village_1_Bat_13C_305"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 42
-      name: "Room_Fleming_Village_1_Bat_13C_306"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 43
-      name: "Room_Fleming_Village_1_Bat_13C_307"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 44
-      name: "Room_Fleming_Village_1_Bat_13C_308"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 45
-      name: "Room_Fleming_Village_1_Bat_13C_309"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 46
-      name: "Room_Fleming_Village_1_Bat_13C_310"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 47
-      name: "Room_Fleming_Village_1_Bat_13C_311"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-    - id: 48
-      name: "Room_Fleming_Village_1_Bat_13C_312"
-      lldp: "LPAS_TX_AND_RX"
-      loop_protect: true
-...
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Alexandre Iooss	fa237cdea3	borgbackups: move variables in playbook Some checks failed continuous-integration/drone/push Build is failing Details	2021-11-28 17:27:41 +01:00
Alexandre Iooss	74871c1ea8	rsyslog: move variables in playbook	2021-11-28 17:09:16 +01:00