diff options
| author | Lars Wirzenius <liw@liw.fi> | 2020-03-23 09:59:53 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2020-03-23 09:59:53 +0200 |
| commit | 3c8f3b3c3303fa8221099e1e183b347387a0fdf1 (patch) | |
| tree | ca5e00beffea51cee10c3849e9c3db61498a306f /ansible | |
| parent | c36fa55774568a42c4a4b8a4951eec995f0afbb5 (diff) | |
| download | ansibleness-3c8f3b3c3303fa8221099e1e183b347387a0fdf1.tar.gz | |
Change: sanify atuin networking setup
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/atuin.yml | 5 | ||||
| -rw-r--r-- | ansible/roles/hetzner-network-bridge/defaults/main.yml | 17 | ||||
| -rw-r--r-- | ansible/roles/hetzner-network-bridge/handlers/main.yml (renamed from ansible/roles/network-bridge/handlers/main.yml) | 0 | ||||
| -rw-r--r-- | ansible/roles/hetzner-network-bridge/tasks/main.yml (renamed from ansible/roles/network-bridge/tasks/main.yml) | 0 | ||||
| -rw-r--r-- | ansible/roles/hetzner-network-bridge/templates/interfaces.j2 (renamed from ansible/roles/network-bridge/templates/interfaces.j2) | 7 | ||||
| -rw-r--r-- | ansible/roles/network-bridge/defaults/main.yml | 8 |
6 files changed, 24 insertions, 13 deletions
diff --git a/ansible/atuin.yml b/ansible/atuin.yml index f919e3b..f03cc43 100644 --- a/ansible/atuin.yml +++ b/ansible/atuin.yml @@ -1,7 +1,7 @@ - hosts: atuin remote_user: root roles: - - network-bridge + - hetzner-network-bridge - sane_debian_system - self-updating-system - comfortable-debian-system @@ -57,7 +57,8 @@ bridge_method: static bridge_nic_addr: 78.46.87.180 bridge_gateway: 78.46.87.161 - bridge_guest_addr: 78.46.87.154 + bridge_guest_addrs: + - 78.46.87.154 # bridge_config: | # address 78.46.87.180 # netmask 255.255.255.224 diff --git a/ansible/roles/hetzner-network-bridge/defaults/main.yml b/ansible/roles/hetzner-network-bridge/defaults/main.yml new file mode 100644 index 0000000..9d14aed --- /dev/null +++ b/ansible/roles/hetzner-network-bridge/defaults/main.yml @@ -0,0 +1,17 @@ +# The name of the external physical interface. You MUST specify this. +bridge_nic: FIXME + +# The statically assigned IPv4 address for the external interface. +# You MUST specify this. +bridge_nic_addr: FIXME + +# The gateway via which the physical external interface should send +# packages. You MUST specify this. +bridge_gateway: FIXME + +# The name of the virtual bridge that will be created. +bridge_iface: br0 + +# The additional IPv4 addresses for the physical host, to be used by a +# VM and thus routed via the virtual bridge. +bridge_guest_addr: [] diff --git a/ansible/roles/network-bridge/handlers/main.yml b/ansible/roles/hetzner-network-bridge/handlers/main.yml index ed984b4..ed984b4 100644 --- a/ansible/roles/network-bridge/handlers/main.yml +++ b/ansible/roles/hetzner-network-bridge/handlers/main.yml diff --git a/ansible/roles/network-bridge/tasks/main.yml b/ansible/roles/hetzner-network-bridge/tasks/main.yml index d8bad30..d8bad30 100644 --- a/ansible/roles/network-bridge/tasks/main.yml +++ b/ansible/roles/hetzner-network-bridge/tasks/main.yml diff --git a/ansible/roles/network-bridge/templates/interfaces.j2 b/ansible/roles/hetzner-network-bridge/templates/interfaces.j2 index 73d112e..ff1b7b5 100644 --- a/ansible/roles/network-bridge/templates/interfaces.j2 +++ b/ansible/roles/hetzner-network-bridge/templates/interfaces.j2 @@ -16,6 +16,7 @@ iface {{ bridge_iface }} inet static bridge_stp off bridge_fd 0 pre-up brctl addbr {{ bridge_iface }} - up ip route add {{ bridge_guest_addr }}/32 dev {{ bridge_iface }} - down ip route del {{ bridge_guest_addr }}/32 dev {{ bridge_iface }} - +{% for guestaddr in bridge_guest_addrs %} + up ip route add {{ guestaddr }}/32 dev {{ bridge_iface }} + down ip route del {{ guestaddr }}/32 dev {{ bridge_iface }} +{% endfor %} diff --git a/ansible/roles/network-bridge/defaults/main.yml b/ansible/roles/network-bridge/defaults/main.yml deleted file mode 100644 index a2dae0a..0000000 --- a/ansible/roles/network-bridge/defaults/main.yml +++ /dev/null @@ -1,8 +0,0 @@ -bridge_nic: FIXME -bridge_iface: br0 - -bridge_method: dhcp -bridge_config: "" - -bridge_method_ipv6: dhcp -bridge_config_ipv6: "" |