From 388257d3e17bc8aada2926cf3015f47f0d252311 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 19 Oct 2021 15:10:09 +0200
Subject: switch back to ansible PPA for focal

---
 inventory/host_vars/ch-equinox-ws.yml | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'inventory/host_vars/ch-equinox-ws.yml')

diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index cd93c242..c6219d75 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -178,8 +178,10 @@ ws_base_extra_packages:
   - pv
   - pwgen
   - python3-autopep8
+  - python3-netaddr
   - python3-pandas
-  - python3-paramiko
+  - python3-passlib
+  - python3-pip
   - python3-plotly
   - python3-ruamel.yaml
   - python3-sphinx
@@ -243,6 +245,8 @@ ws_base_extra_packages:
   # needs apt-repo/spreadspace
   - go
   - info-beamer
+  # needs apt-repo/ansible
+  - ansible
   # needs apt-repo/tor-project
   - tor
   - tor-geoipdb
@@ -255,23 +259,6 @@ ws_base_extra_packages:
   # needs apt-repo/riot
   - element-desktop
 
-## ansible in focal is outdated and the PPA is currently broken
-## will install ansible via pip but listing the deps here:
-  # - ansible
-  - python3-argcomplete
-  - python3-crypto
-  - python3-cryptography
-  - python3-distutils
-  - python3-dnspython
-  - python3-httplib2
-  - python3-jinja2
-  - python3-netaddr
-  - python3-passlib
-  # resolvelib is not packaged for current ubuntu releases - also ansible needs special versions -> leave it to pip
-  # - python3-resolvelib
-  - python3-yaml
-  - python3-pip
-
 ## needs PPA or other external repo ??
   # - bazel
   # - deadbeef
-- 
cgit v1.2.3