From bd8a62b2c3d5c74a608d71f8600f93a0f673ba4e Mon Sep 17 00:00:00 2001
From: Alexander Hughes <Alexander.Hughes@pm.me>
Date: Wed, 17 Jun 2020 08:19:28 -0400
Subject: [PATCH] Fix image build checks missing setuptools

Use apt to install python3-pip, and use pip3 in event system has
both pip2 and pip3 installed. Use apt to install setuptools for
Ansible's consumption.

Change-Id: Idd1ce284298fd4574adf60180d5dc691aacaf6d4
Signed-off-by: Alexander Hughes <Alexander.Hughes@pm.me>
---
 tools/zuul/playbooks/docker-image-build.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index 32b27d73..bccd4f80 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -33,10 +33,12 @@
             allow_unauthenticated: True
           with_items:
             - docker-ce
-            - python-pip
+            - python3-pip
+            - python3-setuptools
         - pip:
             name: docker
             version: 2.7.0
+            executable: pip3
         # NOTE(SamYaple): Allow all connections from containers to host so the
         # containers can access the http server for git and wheels
         - iptables: