From d90c9edc2294ff6922827828078eee67cea9fe0d Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Mon, 9 Nov 2020 15:16:29 +0100
Subject: [PATCH] nodes: fix interface config

---
 nodes/gce/bind01.py          |  4 ++--
 nodes/gce/dns02.py           |  4 ++--
 nodes/gce/dns03.py           |  4 ++--
 nodes/htz-cloud/luther.py    |  6 ++----
 nodes/htz-cloud/pirmasens.py |  6 ++----
 nodes/htz-cloud/sewfile.py   |  6 ++----
 nodes/htz/ex42-1048908.py    | 10 ++++------
 nodes/rx300.py               | 11 +++++++++++
 8 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/nodes/gce/bind01.py b/nodes/gce/bind01.py
index 16252ef..3372669 100644
--- a/nodes/gce/bind01.py
+++ b/nodes/gce/bind01.py
@@ -13,8 +13,8 @@ nodes['gce.bind01'] = {
     },
     'metadata': {
         'interfaces': {
-            'eth0': {
-                'ipv4': {
+            'ens4': {
+                'ips': {
                     '10.156.0.4',
                 },
                 'gateway4': '10.156.0.1',
diff --git a/nodes/gce/dns02.py b/nodes/gce/dns02.py
index 0424e7d..7e2120f 100644
--- a/nodes/gce/dns02.py
+++ b/nodes/gce/dns02.py
@@ -9,8 +9,8 @@ nodes['gce.dns02'] = {
     },
     'metadata': {
         'interfaces': {
-            'eth0': {
-                'ipv4': {
+            'ens4': {
+                'ips': {
                     '10.132.0.2',
                 },
                 'gateway4': '10.132.0.1',
diff --git a/nodes/gce/dns03.py b/nodes/gce/dns03.py
index c2264b1..60d31c4 100644
--- a/nodes/gce/dns03.py
+++ b/nodes/gce/dns03.py
@@ -9,8 +9,8 @@ nodes['gce.dns03'] = {
     },
     'metadata': {
         'interfaces': {
-            'eth0': {
-                'ipv4': {
+            'ens4': {
+                'ips': {
                     '10.166.0.2',
                 },
                 'gateway4': '10.166.0.1',
diff --git a/nodes/htz-cloud/luther.py b/nodes/htz-cloud/luther.py
index bed9b1c..ba31b64 100644
--- a/nodes/htz-cloud/luther.py
+++ b/nodes/htz-cloud/luther.py
@@ -10,11 +10,9 @@ nodes['htz-cloud.luther'] = {
     'metadata': {
         'interfaces': {
             'eth0': {
-                'ipv4': {
+                'ips': {
                     '195.201.136.20',
-                },
-                'ipv6': {
-                    '2a01:4f8:c2c:fc3b::1',
+                    '2a01:4f8:c2c:fc3b::1/64',
                 },
                 'gateway4': '172.31.1.1',
                 'gateway6': 'fe80::1',
diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py
index 351d5ed..15d7a9b 100644
--- a/nodes/htz-cloud/pirmasens.py
+++ b/nodes/htz-cloud/pirmasens.py
@@ -6,11 +6,9 @@ nodes['htz-cloud.pirmasens'] = {
     'metadata': {
         'interfaces': {
             'eth0': {
-                'ipv4': {
+                'ips': {
                     '195.201.90.143',
-                },
-                'ipv6': {
-                    '2a01:4f8:1c1c:2acf::1',
+                    '2a01:4f8:1c1c:2acf::1/64',
                 },
                 'gateway4': '172.31.1.1',
                 'gateway6': 'fe80::1',
diff --git a/nodes/htz-cloud/sewfile.py b/nodes/htz-cloud/sewfile.py
index e421124..66a579b 100644
--- a/nodes/htz-cloud/sewfile.py
+++ b/nodes/htz-cloud/sewfile.py
@@ -11,11 +11,9 @@ nodes['htz-cloud.sewfile'] = {
     'metadata': {
         'interfaces': {
             'eth0': {
-                'ipv4': {
+                'ips': {
                     '116.203.205.248',
-                },
-                'ipv6': {
-                    '2a01:4f8:c0c:c71b::1',
+                    '2a01:4f8:c0c:c71b::1/64',
                 },
                 'gateway4': '172.31.1.1',
                 'gateway6': 'fe80::1',
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 2290fd4..854fe6c 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -24,12 +24,10 @@ nodes['htz.ex42-1048908'] = {
     'metadata': {
         'interfaces': {
             'enp0s31f6': {
-                'ipv4': {
-                    '94.130.52.224',
-                },
-                'ipv6': {
-                    '2a01:4f8:10b:2a5f::02',
-                    '2a01:4f8:10b:2a5f::1337',
+                'ips': {
+                    '94.130.52.224/26',
+                    '2a01:4f8:10b:2a5f::02/64',
+                    '2a01:4f8:10b:2a5f::1337/64',
                 },
                 'gateway4': '94.130.52.193',
                 'gateway6': 'fe80::1',
diff --git a/nodes/rx300.py b/nodes/rx300.py
index 58c2316..7232492 100644
--- a/nodes/rx300.py
+++ b/nodes/rx300.py
@@ -13,6 +13,17 @@ nodes['rx300'] = {
     },
     'groups': set(),
     'metadata': {
+        'interfaces': {
+            'eth0': {
+                'ips': {
+                    '172.19.138.26/24',
+                },
+                'gateway4': '172.19.138.1',
+            },
+            'eth1': {
+                'dhcp': True,
+            },
+        },
         'zfs': {
             'module_options': {
                 'zfs_arc_max_mb': 16384, # 16GB