diff --git a/inventories/chaosknoten/host_vars/router.yaml b/inventories/chaosknoten/host_vars/router.yaml index adbc8d9..5e9c832 100644 --- a/inventories/chaosknoten/host_vars/router.yaml +++ b/inventories/chaosknoten/host_vars/router.yaml @@ -1,5 +1,4 @@ systemd_networkd__config_dir: 'resources/chaosknoten/router/systemd_networkd/' -systemd_networkd__global_config: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/router/systemd_networkd_global_config.conf') }}" nftables__config: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/router/nftables/nftables.conf') }}" ansible_pull__timer_on_calendar: "*-*-* 04:00:00 Europe/Berlin" ansible_pull__timer_randomized_delay_sec: 0min diff --git a/resources/chaosknoten/router/systemd_networkd/20-net1.network b/resources/chaosknoten/router/systemd_networkd/20-net1.network index 5c14d8d..c8bffc1 100644 --- a/resources/chaosknoten/router/systemd_networkd/20-net1.network +++ b/resources/chaosknoten/router/systemd_networkd/20-net1.network @@ -3,6 +3,7 @@ Name=net1 [Network] DNS=212.12.50.158 +IPForward=ipv4 IPv6AcceptRA=no [Address] @@ -10,3 +11,4 @@ Address=212.12.48.123/24 [Route] Gateway=212.12.48.55 + diff --git a/resources/chaosknoten/router/systemd_networkd/20-net2.network b/resources/chaosknoten/router/systemd_networkd/20-net2.network index 39d1f03..b3f497d 100644 --- a/resources/chaosknoten/router/systemd_networkd/20-net2.network +++ b/resources/chaosknoten/router/systemd_networkd/20-net2.network @@ -3,6 +3,7 @@ Name=net2 [Network] #DNS=212.12.50.158 +IPForward=ipv6 IPv6AcceptRA=no [Address] @@ -10,3 +11,4 @@ Address=2a00:14b0:4200:3500::130:2/112 [Route] Gateway=2a00:14b0:4200:3500::130:1 + diff --git a/resources/chaosknoten/router/systemd_networkd_global_config.conf b/resources/chaosknoten/router/systemd_networkd_global_config.conf deleted file mode 100644 index 2d3d8a3..0000000 --- a/resources/chaosknoten/router/systemd_networkd_global_config.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Network] -IPv4Forwarding=true -IPv6Forwarding=true diff --git a/roles/systemd_networkd/README.md b/roles/systemd_networkd/README.md index ac7f115..3297c47 100644 --- a/roles/systemd_networkd/README.md +++ b/roles/systemd_networkd/README.md @@ -9,8 +9,3 @@ Should work on Debian-based distributions. ## Required Arguments - `systemd_networkd__config_dir`: Directory with systemd-networkd configs to deploy. - -## Optional Arguments - -- `systemd_networkd__global_config`: systemd-networkd global configuration to deploy (see `man 5 networkd.conf`). - Defaults to `` (the empty string); diff --git a/roles/systemd_networkd/defaults/main.yaml b/roles/systemd_networkd/defaults/main.yaml deleted file mode 100644 index e84ed28..0000000 --- a/roles/systemd_networkd/defaults/main.yaml +++ /dev/null @@ -1 +0,0 @@ -systemd_networkd__global_config: "" diff --git a/roles/systemd_networkd/tasks/main.yaml b/roles/systemd_networkd/tasks/main.yaml index cc8f4d9..f88ed14 100644 --- a/roles/systemd_networkd/tasks/main.yaml +++ b/roles/systemd_networkd/tasks/main.yaml @@ -12,21 +12,3 @@ recursive: true delete: true become: true - -- name: ensure global systemd-networkd config directory exists - ansible.builtin.file: - path: "/etc/systemd/networkd.conf.d" - state: directory - owner: root - group: root - mode: "0755" - become: true - -- name: ensure global systemd-networkd config is deployed - ansible.builtin.copy: - content: "{{ systemd_networkd__global_config }}" - dest: "/etc/systemd/networkd.conf.d/20-ansible.conf" - mode: "0644" - owner: root - group: root - become: true