From d2c1c6ab0d03b3f93d7b4f57d74b8c569b2d3563 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Fri, 13 Aug 2021 01:19:31 +0200
Subject: [PATCH] wip

---
 bundles/apt/README.md         |  4 ++--
 bundles/apt/metadata.py       |  2 +-
 bundles/gcloud/metadata.py    |  4 ++--
 bundles/grafana/metadata.py   |  4 ++--
 bundles/hostname/metadata.py  |  2 +-
 bundles/hosts/metadata.py     | 28 ++++++++++++++--------------
 bundles/influxdb2/metadata.py |  4 ++--
 bundles/telegraf/metadata.py  |  4 ++--
 groups/os/debian-10.py        |  4 ++--
 groups/os/debian-11.py        |  4 ++--
 groups/os/debian.py           |  4 ++--
 11 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/bundles/apt/README.md b/bundles/apt/README.md
index ec66fa1..73afeb1 100644
--- a/bundles/apt/README.md
+++ b/bundles/apt/README.md
@@ -4,10 +4,10 @@
         'packages': {
             'apt-transport-https': {},
         },
-        'sources': [
+        'sources': {
             # place key under data/apt/keys/packages.cloud.google.com.{asc|gpg}
             'deb https://packages.cloud.google.com/apt cloud-sdk main',
-        ],
+        },
     },
 }
 ```
diff --git a/bundles/apt/metadata.py b/bundles/apt/metadata.py
index f62c8ac..da4fb50 100644
--- a/bundles/apt/metadata.py
+++ b/bundles/apt/metadata.py
@@ -1,6 +1,6 @@
 defaults = {
     'apt': {
         'packages': {},
-        'sources': [],
+        'sources': set(),
     },
 }
diff --git a/bundles/gcloud/metadata.py b/bundles/gcloud/metadata.py
index 4d2b21f..2112a61 100644
--- a/bundles/gcloud/metadata.py
+++ b/bundles/gcloud/metadata.py
@@ -7,8 +7,8 @@ defaults = {
             'google-cloud-sdk': {},
             'python3-crcmod': {},
         },
-        'sources': [
+        'sources': {
             'deb https://packages.cloud.google.com/apt cloud-sdk main',
-        ],
+        },
     },
 }
diff --git a/bundles/grafana/metadata.py b/bundles/grafana/metadata.py
index 90089d1..74d9a34 100644
--- a/bundles/grafana/metadata.py
+++ b/bundles/grafana/metadata.py
@@ -7,9 +7,9 @@ defaults = {
         'packages': {
             'grafana': {},
         },
-        'sources': [
+        'sources': {
             'deb https://packages.grafana.com/oss/deb stable main',
-        ],
+        },
     },
     'grafana': {
         'config': {
diff --git a/bundles/hostname/metadata.py b/bundles/hostname/metadata.py
index 6729088..7cb78a4 100644
--- a/bundles/hostname/metadata.py
+++ b/bundles/hostname/metadata.py
@@ -3,7 +3,7 @@ hostname = '.'.join([*reversed(node.name.split('.')), 'ckn', 'li'])
 defaults = {
     'hostname': hostname,
     'hosts': {
-        '127.0.0.1': [hostname],
+        '127.0.0.1': {hostname},
     },
 }
 
diff --git a/bundles/hosts/metadata.py b/bundles/hosts/metadata.py
index 0e99b4c..ae3b21e 100644
--- a/bundles/hosts/metadata.py
+++ b/bundles/hosts/metadata.py
@@ -1,28 +1,28 @@
 defaults = {
     'hosts': {
-        '127.0.0.1': [
+        '127.0.0.1': {
             'localhost',
             node.name,
-        ],
-        '::1': [
+        },
+        '::1': {
             'localhost',
             'ip6-localhost',
             'ip6-loopback',
-        ],
-        'fe00::0': [
+        },
+        'fe00::0': {
             'ip6-localnet'
-        ],
-        'ff00::0': [
+        },
+        'ff00::0': {
             'ip6-mcastprefix'
-        ],
-        'ff02::1': [
+        },
+        'ff02::1': {
             'ip6-allnodes'
-        ],
-        'ff02::2': [
+        },
+        'ff02::2': {
             'ip6-allrouters'
-        ],
-        'ff02::3': [
+        },
+        'ff02::3': {
             'ip6-allhosts'
-        ],
+        },
     },
 }
diff --git a/bundles/influxdb2/metadata.py b/bundles/influxdb2/metadata.py
index 0cb5808..467f8d1 100644
--- a/bundles/influxdb2/metadata.py
+++ b/bundles/influxdb2/metadata.py
@@ -5,9 +5,9 @@ defaults = {
         'packages': {
             'influxdb2': {},
         },
-        'sources': [
+        'sources': {
             'deb https://repos.influxdata.com/debian {release} stable',
-        ],
+        },
     },
     'influxdb': {
         'port': '8200',
diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 41e6743..228d788 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -3,11 +3,11 @@ defaults = {
         'packages': {
             'telegraf': {},
         },
-        'sources': [
+        'sources': {
             # FIXME
             # 'deb https://repos.influxdata.com/debian {release} stable',
             'deb https://repos.influxdata.com/debian buster stable',
-        ],
+        },
     },
     'telegraf': {
         'config': {
diff --git a/groups/os/debian-10.py b/groups/os/debian-10.py
index 6f72004..54a700a 100644
--- a/groups/os/debian-10.py
+++ b/groups/os/debian-10.py
@@ -4,9 +4,9 @@
     ],
     'metadata': {
         'apt': {
-            'sources': [
+            'sources': {
                 'deb http://security.debian.org/debian-security {release}/updates main contrib non-free',
-            ],
+            },
         },
         'php': {
             'version': '7.3',
diff --git a/groups/os/debian-11.py b/groups/os/debian-11.py
index 731b69c..6720190 100644
--- a/groups/os/debian-11.py
+++ b/groups/os/debian-11.py
@@ -4,9 +4,9 @@
     ],
     'metadata': {
         'apt': {
-            'sources': [
+            'sources': {
                 'deb http://security.debian.org/ {release}-security main contrib non-free',
-            ],
+            },
         },
         'php': {
             'version': '7.4',
diff --git a/groups/os/debian.py b/groups/os/debian.py
index 7f80d9f..cb44d5d 100644
--- a/groups/os/debian.py
+++ b/groups/os/debian.py
@@ -7,11 +7,11 @@
     ],
     'metadata': {
         'apt': {
-            'sources': [
+            'sources': {
                 'deb http://deb.debian.org/debian {release} main non-free contrib',
                 'deb http://deb.debian.org/debian {release}-updates main contrib non-free',
                 'deb http://deb.debian.org/debian {release}-backports main contrib non-free',
-            ],
+            },
             'packages': {
                 'mtr-tiny': {},
             },