From 9b8ee81869bcb736e5c0bb81b5e6b6bab5840647 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 9 Aug 2018 10:11:36 +0100
Subject: [PATCH] Install setuptools when using easy_install

Change-Id: Iee7da01c111a2fdac986861c1da113c075259854
Story: 2003380
Task: 24455
---
 ansible/kayobe-target-venv.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ansible/kayobe-target-venv.yml b/ansible/kayobe-target-venv.yml
index 08ddb7f7a..6beba4614 100644
--- a/ansible/kayobe-target-venv.yml
+++ b/ansible/kayobe-target-venv.yml
@@ -68,8 +68,15 @@
             activate_virtualenv_path: "{{ virtualenv }}"
       when: virtualenv is defined
 
-    - name: Ensure pip is installed
-      easy_install:
-        name: pip
-      become: True
+    - block:
+        - name: Ensure the python-setuptools package is installed
+          package:
+            name: python-setuptools
+            state: installed
+          become: True
+
+        - name: Ensure pip is installed
+          easy_install:
+            name: pip
+          become: True
       when: virtualenv is not defined