diff --git a/bundles/c3voc-addons/items.py b/bundles/c3voc-addons/items.py index c1e2822..4630b61 100644 --- a/bundles/c3voc-addons/items.py +++ b/bundles/c3voc-addons/items.py @@ -26,7 +26,16 @@ pkg_apt = { 'netcat': {}, 'python3': {}, 'python3-dev': {}, - 'python3-pip': {}, + 'python3-setuptools': { + 'needed_by': { + 'pkg_pip:', + }, + }, + 'python3-pip': { + 'needed_by': { + 'pkg_pip:', + }, + }, 'python3-virtualenv': {}, 'rsync': {}, 'tar': {}, diff --git a/bundles/systemd-networkd/items.py b/bundles/systemd-networkd/items.py index 8c52336..b9de7f0 100644 --- a/bundles/systemd-networkd/items.py +++ b/bundles/systemd-networkd/items.py @@ -11,24 +11,11 @@ files = { if node.metadata.get('systemd-networkd/enable-resolved', False): symlinks['/etc/resolv.conf'] = { 'target': '/run/systemd/resolve/stub-resolv.conf', - 'needed_by': { - 'pkg_apt:', - 'pkg_pacman:', - }, - } - svc_systemd['systemd-resolved'] = { - 'needed_by': { - 'pkg_apt:', - 'pkg_pacman:', - }, } + svc_systemd['systemd-resolved'] = {} else: files['/etc/resolv.conf'] = { 'content_type': 'mako', - 'needed_by': { - 'pkg_apt:', - 'pkg_pacman:', - }, } diff --git a/nodes/voc/pretalx.py b/nodes/voc/pretalx.py index 2f6f708..9904f23 100644 --- a/nodes/voc/pretalx.py +++ b/nodes/voc/pretalx.py @@ -64,5 +64,6 @@ nodes['voc.pretalx'] = { }, }, 'os': 'debian', - 'os_version': (10,) + 'os_version': (10,), + 'pip_command': 'pip3', }