diff --git a/files/nspawn-nat.service b/files/nspawn-nat.service deleted file mode 100644 index d20a7d24bfed9eef25022b274aec8d731461286f..0000000000000000000000000000000000000000 --- a/files/nspawn-nat.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description="Enable NAT on nspawn bridge due to Debian bug #787480." -Requires=systemd-networkd -After=systemd-networkd -After=ufw - -[Service] -Type=oneshot -RemainAfterExit=yes -Environment=network="192.168.123.0/24" -ExecStart=/sbin/iptables -w -t nat -A POSTROUTING -s "$network" ! -d "$network" -j MASQUERADE -ExecStop=/sbin/iptables -w -t nat -D POSTROUTING -s "$network" ! -d "$network" -j MASQUERADE - -[Install] -WantedBy=network.target diff --git a/files/nspawnbr0.netdev b/files/nspawnbr0.netdev deleted file mode 100644 index 26f360970b7baaf938c0b4b7013368a61f6fd2d5..0000000000000000000000000000000000000000 --- a/files/nspawnbr0.netdev +++ /dev/null @@ -1,3 +0,0 @@ -[NetDev] -Name=nspawnbr0 -Kind=bridge diff --git a/files/nspawnbr0.network b/files/nspawnbr0.network deleted file mode 100644 index 456324ed1fb18dd21513ecabd977026efaaaf610..0000000000000000000000000000000000000000 --- a/files/nspawnbr0.network +++ /dev/null @@ -1,7 +0,0 @@ -[Match] -Name=nspawnbr0 - -[Network] -Address=192.168.123.1/24 -DHCPServer=yes -IPMasquerade=yes diff --git a/tasks/main.yml b/tasks/main.yml index fa068679c2a8ba4c7c60487647d5477dcdec957e..7bc45f42de62d73d4b31ce19ea294b341fc0ac48 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -18,11 +18,9 @@ - libnss-myhostname - libnss-mymachines - libnss-resolve - - ufw - btrfs-tools - debootstrap - yum - - dnsmasq - name: Create npawn configuration directory file: @@ -31,55 +29,3 @@ group: root mode: '0755' state: directory - -- name: Allow IP forwarding in UFW - ufw: - direction: routed - policy: allow - -- name: Allow DHCP, DNS in UFW - with_items: - - 53 - - 67 - - 68 - ufw: - interface: nspawnbr0 - policy: allow - proto: udp - rule: allow - to_port: '{{ item }}' - -- name: Configure systemd-networkd - with_fileglob: - - '*.netdev' - - '*.network' - - '*.link' - copy: - src: '{{ item }}' - dest: '/etc/systemd/network/{{ item|basename }}' - owner: root - group: root - mode: '0644' - -- name: Add NAT workaround for Debian bug #787480 - copy: - src: nspawn-nat.service - dest: /etc/systemd/system/nspawn-nat.service - owner: root - group: root - mode: '0644' - -- name: Disable networking service, enable systemd-networkd - with_items: - - name: systemd-resolved - state: started - enabled: yes - - name: systemd-networkd - state: started - enabled: yes - - name: networking - enabled: no - service: - name: '{{ item.name }}' - state: '{{ item.state|default(omit) }}' - enabled: '{{ item.enabled }}'