5 files changed, 61 insertions, 18 deletions
diff --git a/os/config/roles/network/files/rules.v6 b/os/config/roles/network/files/rules.v6
deleted file mode 100644
index 17ff71c..0000000
--- a/os/config/roles/network/files/rules.v6
+++ /dev/null
@@ -1,12 +0,0 @@
-# WARNING!! When rules.{v4,v6} are changed, the whole iptables configuration is reloaded.
-# This creates issues with Docker, which injects its own configuration in iptables when it starts.
-# In practice, most (all?) containers will break if rules.{v4,v6} are changed,
-# and docker will have to be restared.
-
-
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
-
diff --git a/os/config/roles/network/tasks/main.yml b/os/config/roles/network/tasks/main.yml
index 1443e0c..caa6bff 100644
--- a/os/config/roles/network/tasks/main.yml
+++ b/os/config/roles/network/tasks/main.yml
@@ -1,8 +1,11 @@
 - name: "Deploy iptablesv4 configuration"
-  template: src=rules.v4.j2 dest=/etc/iptables/rules.v4
+  template: src=rules.v4 dest=/etc/iptables/rules.v4
 
 - name: "Deploy iptablesv6 configuration"
-  copy: src=rules.v6 dest=/etc/iptables/rules.v6
+  template: src=rules.v6 dest=/etc/iptables/rules.v6
+
+- name: "Deploy systemd-networkd configuration"
+  template: src=en.network dest=/etc/systemd/network/en.network
 
 - name: "Activate IP forwarding"
   sysctl:
diff --git a/os/config/roles/network/templates/en.network b/os/config/roles/network/templates/en.network
new file mode 100644
index 0000000..b9b52e9
--- /dev/null
+++ b/os/config/roles/network/templates/en.network
@@ -0,0 +1,9 @@
+[Match]
+Name={{ interface }}
+
+[Network]
+Address={{ ipv4 }}/24
+Address={{ ipv6 }}/64
+Gateway=192.168.1.254
+DNS={{ ipv4 }}
+DNS={{ dns_server }}
diff --git a/os/config/roles/network/templates/rules.v4.j2 b/os/config/roles/network/templates/rules.v4
index a446139..a5f138b 100644
--- a/os/config/roles/network/templates/rules.v4.j2
+++ b/os/config/roles/network/templates/rules.v4
@@ -3,15 +3,18 @@
 :FORWARD DROP [0:0]
 :OUTPUT ACCEPT [0:0]
 
+# Internet Control Message Protocol
+-A INPUT -p icmp -j ACCEPT
+
 # Administration
 -A INPUT -p tcp  --dport 22 -j ACCEPT
 
-# Cluster
+# Diplonat needs everything open to communicate with IGD with the router
 -A INPUT -s 192.168.1.254 -j ACCEPT
--A INPUT -s 82.253.205.190 -j ACCEPT
+
+# Cluster
 {% for selected_host in groups['cluster_nodes'] %}
--A INPUT -s {{ hostvars[selected_host]['public_ip'] }} -j ACCEPT
--A INPUT -s {{ hostvars[selected_host]['private_ip'] }} -j ACCEPT
+-A INPUT -s {{ hostvars[selected_host]['ipv4'] }} -j ACCEPT
 {% endfor %}
 
 # Local
diff --git a/os/config/roles/network/templates/rules.v6 b/os/config/roles/network/templates/rules.v6
new file mode 100644
index 0000000..50737a0
--- /dev/null
+++ b/os/config/roles/network/templates/rules.v6
@@ -0,0 +1,40 @@
+*filter
+:INPUT DROP [0:0]
+:FORWARD DROP [0:0]
+:OUTPUT ACCEPT [0:0]
+
+# Internet Control Message Protocol
+# (required)
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -p ipv6-icmp -j ACCEPT
+
+# Administration
+-A INPUT -p tcp --dport 22 -j ACCEPT
+
+# Cluster
+{% for selected_host in groups['cluster_nodes'] %}
+-A INPUT -s {{ hostvars[selected_host]['ipv6'] }} -j ACCEPT
+{% endfor %}
+
+# Local
+-A INPUT -i docker0 -j ACCEPT
+-A INPUT -s ::1/128 -j ACCEPT
+-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+
+COMMIT
+
+*nat
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
+
+*mangle
+:PREROUTING ACCEPT [0:0]
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+:POSTROUTING ACCEPT [0:0]
+COMMIT
+