From a540033cf2472eb25eea69e2ae513690930d83a2 Mon Sep 17 00:00:00 2001 From: Julian Labus Date: Sun, 4 Nov 2018 01:51:26 +0100 Subject: [PATCH] Inventory + Roles: remove legacy_gateways --- inventory/group_vars/all | 2 -- roles/service-bird-lg/templates/lg.cfg.j2 | 9 --------- roles/service-fastd-mesh/README.md | 2 -- .../templates/fastd_peer_limit_config.yaml.j2 | 3 --- 4 files changed, 16 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 8d25bfc..3ec1c6d 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -181,5 +181,3 @@ bgp_mwu_servers: extrasahne: ipv4: 10.37.0.42 ipv6: fd37:b4dc:4b1e::a25:2a - -legacy_gateways: diff --git a/roles/service-bird-lg/templates/lg.cfg.j2 b/roles/service-bird-lg/templates/lg.cfg.j2 index f98a98a..7348073 100644 --- a/roles/service-bird-lg/templates/lg.cfg.j2 +++ b/roles/service-bird-lg/templates/lg.cfg.j2 @@ -11,9 +11,6 @@ PROXY = { {% for host in groups["ffmwu-gateways"] %} "{{ host.rsplit('.freifunk-mwu.de')[0] }}" : 5000, {% endfor %} -{% for host in legacy_gateways %} - "{{ host }}" : 5000, -{% endfor %} } # Used for bgpmap @@ -21,18 +18,12 @@ ROUTER_IP = { {% for host in groups["ffmwu-gateways"] %} "{{ host.rsplit('.freifunk-mwu.de')[0] }}" : [ "{{ bgp_ipv4_transfer_net | ipaddr('net') | ipaddr(hostvars[host]['magic']) | ipaddr('ip') }}", "{{ bgp_ipv6_transfer_net | ipaddr('net') | ipsubnet(64, 0) | ipaddr(hostvars[host]['magic']) | ipaddr('ip') }}" ], {% endfor %} -{% for host in legacy_gateways %} - "{{ host }}" : [ "{{ bgp_mwu_servers[host].ipv4 }}", "{{ bgp_mwu_servers[host].ipv6 }}"], -{% endfor %} } AS_NUMBER = { {% for host in groups["ffmwu-gateways"] %} "{{ host.rsplit('.freifunk-mwu.de')[0] }}" : "{{ as_private_mwu }}", {% endfor %} -{% for host in legacy_gateways %} - "{{ host }}" : "{{ as_private_mwu }}", -{% endfor %} } #WHOIS_SERVER = "whois.foo.bar" diff --git a/roles/service-fastd-mesh/README.md b/roles/service-fastd-mesh/README.md index f46e41b..013d484 100644 --- a/roles/service-fastd-mesh/README.md +++ b/roles/service-fastd-mesh/README.md @@ -35,8 +35,6 @@ meshes: ... ``` -- Liste `legacy_gateways` - ## fastd Secrets Die privaten Schlüssel der fastd Instanzen sind sehr sensible Informationen, weshalb wir diese in ein nicht öffentliches passwordstore ausgelagert haben. diff --git a/roles/service-fastd-mesh/templates/fastd_peer_limit_config.yaml.j2 b/roles/service-fastd-mesh/templates/fastd_peer_limit_config.yaml.j2 index 2a0a480..20ce1bc 100644 --- a/roles/service-fastd-mesh/templates/fastd_peer_limit_config.yaml.j2 +++ b/roles/service-fastd-mesh/templates/fastd_peer_limit_config.yaml.j2 @@ -16,9 +16,6 @@ gateways: {% for gateway in groups['ffmwu-gateways'] %} - {{ gateway.rsplit('.freifunk-mwu.de')[0] }} {% endfor %} -{% for gateway in legacy_gateways %} - - {{ gateway }} -{% endfor %} restart_max: 43200 stat: 'fastd_status.json' stat_ext: 'http://%s.freifunk-mwu.de/%s'