Inventory + Roles: remove legacy_gateways

This commit is contained in:
Julian Labus 2018-11-04 01:51:26 +01:00
parent 9f42eaf942
commit a540033cf2
No known key found for this signature in database
GPG key ID: 8AF209F2C6B3572A
4 changed files with 0 additions and 16 deletions

View file

@ -181,5 +181,3 @@ bgp_mwu_servers:
extrasahne: extrasahne:
ipv4: 10.37.0.42 ipv4: 10.37.0.42
ipv6: fd37:b4dc:4b1e::a25:2a ipv6: fd37:b4dc:4b1e::a25:2a
legacy_gateways:

View file

@ -11,9 +11,6 @@ PROXY = {
{% for host in groups["ffmwu-gateways"] %} {% for host in groups["ffmwu-gateways"] %}
"{{ host.rsplit('.freifunk-mwu.de')[0] }}" : 5000, "{{ host.rsplit('.freifunk-mwu.de')[0] }}" : 5000,
{% endfor %} {% endfor %}
{% for host in legacy_gateways %}
"{{ host }}" : 5000,
{% endfor %}
} }
# Used for bgpmap # Used for bgpmap
@ -21,18 +18,12 @@ ROUTER_IP = {
{% for host in groups["ffmwu-gateways"] %} {% 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') }}" ], "{{ 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 %} {% endfor %}
{% for host in legacy_gateways %}
"{{ host }}" : [ "{{ bgp_mwu_servers[host].ipv4 }}", "{{ bgp_mwu_servers[host].ipv6 }}"],
{% endfor %}
} }
AS_NUMBER = { AS_NUMBER = {
{% for host in groups["ffmwu-gateways"] %} {% for host in groups["ffmwu-gateways"] %}
"{{ host.rsplit('.freifunk-mwu.de')[0] }}" : "{{ as_private_mwu }}", "{{ host.rsplit('.freifunk-mwu.de')[0] }}" : "{{ as_private_mwu }}",
{% endfor %} {% endfor %}
{% for host in legacy_gateways %}
"{{ host }}" : "{{ as_private_mwu }}",
{% endfor %}
} }
#WHOIS_SERVER = "whois.foo.bar" #WHOIS_SERVER = "whois.foo.bar"

View file

@ -35,8 +35,6 @@ meshes:
... ...
``` ```
- Liste `legacy_gateways`
## fastd Secrets ## fastd Secrets
Die privaten Schlüssel der fastd Instanzen sind sehr sensible Informationen, weshalb wir diese in ein nicht öffentliches passwordstore ausgelagert haben. Die privaten Schlüssel der fastd Instanzen sind sehr sensible Informationen, weshalb wir diese in ein nicht öffentliches passwordstore ausgelagert haben.

View file

@ -16,9 +16,6 @@ gateways:
{% for gateway in groups['ffmwu-gateways'] %} {% for gateway in groups['ffmwu-gateways'] %}
- {{ gateway.rsplit('.freifunk-mwu.de')[0] }} - {{ gateway.rsplit('.freifunk-mwu.de')[0] }}
{% endfor %} {% endfor %}
{% for gateway in legacy_gateways %}
- {{ gateway }}
{% endfor %}
restart_max: 43200 restart_max: 43200
stat: 'fastd_status.json' stat: 'fastd_status.json'
stat_ext: 'http://%s.freifunk-mwu.de/%s' stat_ext: 'http://%s.freifunk-mwu.de/%s'