From a2a1630dfb4ee977ad581ffeacebec5fdb25085e Mon Sep 17 00:00:00 2001 From: linus Date: Fri, 3 Dec 2021 13:47:18 +0100 Subject: [PATCH] unify into `peers` variable --- group_vars/all.yml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 083bb66..1cf133f 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -27,14 +27,23 @@ cidrs: ## with 16,384 usable IP addresses - { "parent": "fsfe", "name": "machines", "cidr": "10.200.64.0/18" } -admin_peers: - # humans > admins - - { "cidr": "admins", "name": "linus" } - - { "cidr": "admins", "name": "max-mehl" } - - { "cidr": "admins", "name": "albert" } - -peers: - # machines - - { "cidr": "machines", "name": "meitner" } - - { "cidr": "machines", "name": "claus" } - - { "cidr": "machines", "name": "cont1-plutex" } +# humans > admins, e.g. +# - { "cidr": "admins", "name": "linus", "admin": "true" } +# humans > others, e.g. +# - { "cidr": "others", "name": "mk", "admin": "false" } +# - { "cidr": "others", "name": "fi", "admin": "false" } +# - { "cidr": "others", "name": "fani", "admin": "false" } +# machines, e.g. +# - { "cidr": "machines", "name": "cont1-plutex", "admin": "false" } +peers: "{{ peers_var|from_yaml }}" +peers_var: | + - { "cidr": "admins", "name": "linus", "admin": "true" } + - { "cidr": "admins", "name": "max-mehl", "admin": "true" } + - { "cidr": "admins", "name": "albert", "admin": "true" } + {% for host in groups['innernet_client'] %} + - { + "cidr": "machines", + "name": {{ host.replace('.', '-').replace('-fsfeurope-org', '') }}, + "admin": "false" + } + {% endfor %}