From 6f87a1d2408f356019f0df7fb22e2f6537f86cb8 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Mon, 9 Nov 2020 16:38:59 +0100 Subject: [PATCH] bundles/systemd-networkd: also deploy resolv.conf --- bundles/systemd-networkd/files/resolv.conf | 3 +++ bundles/systemd-networkd/items.py | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 bundles/systemd-networkd/files/resolv.conf diff --git a/bundles/systemd-networkd/files/resolv.conf b/bundles/systemd-networkd/files/resolv.conf new file mode 100644 index 0000000..a3e0cc0 --- /dev/null +++ b/bundles/systemd-networkd/files/resolv.conf @@ -0,0 +1,3 @@ +% for nameserver in sorted(node.metadata.get('nameservers', {'9.9.9.10', '2620:fe::10'})): +${nameserver} +% endfor diff --git a/bundles/systemd-networkd/items.py b/bundles/systemd-networkd/items.py index 448b705..52edaf8 100644 --- a/bundles/systemd-networkd/items.py +++ b/bundles/systemd-networkd/items.py @@ -1,9 +1,18 @@ assert node.has_bundle('systemd') +pkg_apt = { + 'resolvconf': { + 'installed': False, + }, +} + files = { '/etc/network/interfaces': { 'delete': True, }, + '/etc/resolv.conf': { + 'content_type': 'mako', + }, } directories = {