From 8b845974fb2765364cf94268a332ad217edc5d23 Mon Sep 17 00:00:00 2001
From: Steven Robertson <srtrumpetaggie@gmail.com>
Date: Sun, 25 Oct 2020 22:27:45 -0700
Subject: [PATCH] netaddr needs to be on the Ansible controller, not in target
 nodes

---
 .ci/debops_common_install.py | 2 +-
 .ci/debops_common_tests.py   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.ci/debops_common_install.py b/.ci/debops_common_install.py
index 181fc7b9..42e8799e 100755
--- a/.ci/debops_common_install.py
+++ b/.ci/debops_common_install.py
@@ -10,7 +10,7 @@ ci_lib.run_batches([
         # Must be installed separately, as PyNACL indirect requirement causes
         # newer version to be installed if done in a single pip run.
         'pip install "pycparser<2.19"',
-        'pip install -qqq debops==2.1.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
+        'pip install -qqq debops==2.1.2 netaddr==0.8.0 ansible==%s' % ci_lib.ANSIBLE_VERSION,
     ],
     [
         'docker pull %s' % (ci_lib.image_for_distro('debian'),),
diff --git a/.ci/debops_common_tests.py b/.ci/debops_common_tests.py
index 30bc1c9a..97631704 100755
--- a/.ci/debops_common_tests.py
+++ b/.ci/debops_common_tests.py
@@ -66,10 +66,6 @@ with ci_lib.Fold('job_setup'):
     print('---')
     print()
 
-    print("Setting up python-netaddr...")
-    os.system('ANSIBLE_HOST_KEY_CHECKING=False ANSIBLE_STRATEGY_PLUGINS={} ansible all -i {} -m apt -a "name=python-netaddr state=present update_cache=yes" --become'.format(
-        ansible_strategy_plugin, inventory_path))
-
     # Now we have real host key checking, we need to turn it off
     os.environ['ANSIBLE_HOST_KEY_CHECKING'] = 'False'