Compare commits

..

No commits in common. "eb6b599b5c315bdcf04ef44f820edfcd4f47f294" and "e9fbf78741954da39e6e6fafea626318898fb7cf" have entirely different histories.

7 changed files with 11 additions and 42 deletions

View File

@ -1,7 +1,6 @@
[defaults]
inventory = inventory
interpreter_python = auto_silent
vault_password_file = ~/vault_password
[privilege_escalation]
become = True

View File

@ -1,26 +0,0 @@
---
router_id: "185.38.175.78"
router_v4_ip: "185.38.175.78"
router_v6_ip: "2a01:4262:1ab:20::78"
bgp_peers:
- name: "labitat_v4"
template: "transit_v4"
peer_asn: "205235"
neighbor_ip: "185.38.175.65"
- name: "labitat_v6"
template: "transit_v6"
peer_asn: "205235"
neighbor_ip: "2a01:4262:1ab:20::1"
- name: "hessnet_home"
template: "peer_hessnet"
peer_asn: "64512"
neighbor_ip: "2001:678:15c:a00::1"
filters:
export: "{ peer_export_dfz_and_default(); }"
import: "myroutes_import_export"
announce_from_here: true
configure_static_multihop_routes: false

View File

@ -6,7 +6,7 @@ router_v6_ip: "2001:19f0:5001:256b:5400:02ff:feb0:cd41"
bgp_peers:
- name: "vultr_v4"
template: "peer_vultr_v4"
peer_asn: "64515"
asn: "64515"
neighbor_ip: "169.254.169.254"
password: !vault |
$ANSIBLE_VAULT;1.1;AES256
@ -18,7 +18,7 @@ bgp_peers:
- name: "vultr_v6"
template: "peer_vultr_v6"
peer_asn: "64515"
asn: "64515"
neighbor_ip: "2001:19f0:ffff::1"
password: !vault |
$ANSIBLE_VAULT;1.1;AES256
@ -30,7 +30,7 @@ bgp_peers:
- name: "home_router"
template: "peer_hessnet"
peer_asn: "209616"
asn: "209616"
neighbor_ip: "172.16.12.19"
filters:
export: "{ peer_export_default_only(); }"

View File

@ -2,15 +2,9 @@
archvm1.hosts.v6.hessnet.dk
archvm2.hosts.v6.hessnet.dk
[routers_vultr]
[routers]
# frb1.cph.dk.routers.v6.hessnet.dk
vul1.ams.nl.routers.v6.hessnet.dk
[routers_copenhagen]
frb1.cph.dk.routers.v6.hessnet.dk
[routers:children]
routers_vultr
routers_copenhagen
[as209616_webservers]
archvm1.hosts.v6.hessnet.dk

View File

@ -172,14 +172,15 @@ protocol direct {
protocol kernel {
ipv4 {
import filter myroutes_import_export;
export filter kernel_export;
export none; #filter kernel_export;
};
}
protocol kernel kernel6 {
scan time 5;
ipv6 {
import filter myroutes_import_export;
export filter kernel_export;
import none;
export none; #filter kernel_export;
};
}
@ -234,7 +235,7 @@ template bgp peer_hessnet {
{% for peer in bgp_peers %}
protocol bgp {{ peer.name }} from {{ peer.template }} {
neighbor {{peer.neighbor_ip}} as {{peer.peer_asn}};
neighbor {{peer.neighbor_ip}} as {{peer.asn}};
{% if peer.password is defined %}
password "{{ peer.password }}";
{% endif %}

View File

@ -14,6 +14,7 @@
- "website"
- "cockpit"
- name: "Configure Bird 2.0 Routers"
hosts: "routers"
become: "yes"