From 880184807b5305d49ab5116dbf5d4df31f547291 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 29 Aug 2020 21:09:42 +0200
Subject: [PATCH] nodes: use node.os and node.os_version correctly

---
 nodes/gce/bind01.py          | 7 +++----
 nodes/htz-cloud/pirmasens.py | 4 ++--
 nodes/htz-cloud/sewfile.py   | 4 ++--
 nodes/htz/ex42-1048908.py    | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nodes/gce/bind01.py b/nodes/gce/bind01.py
index 549cafc..6248917 100644
--- a/nodes/gce/bind01.py
+++ b/nodes/gce/bind01.py
@@ -5,8 +5,7 @@ nodes['gce.bind01'] = {
     'groups': {
         'dns',
     },
-    'metadata': {
-        'os': 'debian',
-        'os_release': 'buster',
-    },
+    'metadata': {},
+    'os': 'debian',
+    'os_version': (10, 5),
 }
diff --git a/nodes/htz-cloud/pirmasens.py b/nodes/htz-cloud/pirmasens.py
index c5b5c12..c6751f3 100644
--- a/nodes/htz-cloud/pirmasens.py
+++ b/nodes/htz-cloud/pirmasens.py
@@ -24,7 +24,7 @@ nodes['htz-cloud.pirmasens'] = {
                 'delete': True,
             },
         },
-        'os': 'debian',
-        'os_release': 'buster',
     },
+    'os': 'debian',
+    'os_version': (10, 5),
 }
diff --git a/nodes/htz-cloud/sewfile.py b/nodes/htz-cloud/sewfile.py
index 4888756..4283e23 100644
--- a/nodes/htz-cloud/sewfile.py
+++ b/nodes/htz-cloud/sewfile.py
@@ -16,7 +16,7 @@ nodes['htz-cloud.sewfile'] = {
                 },
             },
         },
-        'os': 'debian',
-        'os_release': 'buster',
     },
+    'os': 'debian',
+    'os_version': (10, 5),
 }
diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py
index 808995c..70949a9 100644
--- a/nodes/htz/ex42-1048908.py
+++ b/nodes/htz/ex42-1048908.py
@@ -45,7 +45,7 @@ nodes['htz.ex42-1048908'] = {
                 'reboot': False,
             },
             'repos': {
-                'buster-backports': {
+                'backports': {
                     'install_gpg_key': False, # default debian signing key
                     'items': [
                         'deb http://deb.debian.org/debian buster-backports main',
@@ -232,7 +232,7 @@ nodes['htz.ex42-1048908'] = {
                 ],
             },
         },
-        'os': 'debian',
-        'os_release': 'buster',
     },
+    'os': 'debian',
+    'os_version': (10, 5),
 }