From 05696369decc9ff704575c02d96d04e7accc6c12 Mon Sep 17 00:00:00 2001
From: Thomas Gambier <thomas.gambier@nexedi.com>
Date: Wed, 17 Jul 2019 17:08:03 +0200
Subject: [PATCH] Support to have only pip3 installed
---
playbook/roles/slapcache/tasks/main.yml | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/playbook/roles/slapcache/tasks/main.yml b/playbook/roles/slapcache/tasks/main.yml
index 279f13d..6f7ed52 100644
--- a/playbook/roles/slapcache/tasks/main.yml
+++ b/playbook/roles/slapcache/tasks/main.yml
@@ -6,13 +6,28 @@
failed_when: false
register: pip_installed
+ - name: Register pip3 installation status
+ command: which pip3
+ changed_when: false
+ failed_when: false
+ register: pip3_installed
+
- name: Make sure pip is installed
shell: easy_install pip
- when: pip_installed|failed
+ when: pip_installed|failed and pip3_installed|failed
- # install module with pip so that on debian 8 we can download the playbook in shacache
- - name: Install/Upgrade latest slapos.libnetworkcache
+ - name: Install/Upgrade latest slapos.libnetworkcache using pip
shell: pip install --upgrade slapos.libnetworkcache
+ when: pip_installed|succeeded
- - name: Instal/Upgrade latest slapcache
+ - name: Install/Upgrade latest slapcache using pip
shell: pip install --upgrade slapcache
+ when: pip_installed|succeeded
+
+ - name: Install/Upgrade latest slapos.libnetworkcache using pip3
+ shell: pip3 install --upgrade slapos.libnetworkcache
+ when: pip3_installed|succeeded
+
+ - name: Install/Upgrade latest slapcache using pip3
+ shell: pip3 install --upgrade slapcache
+ when: pip3_installed|succeeded
--
2.30.9