From 756af57787dbf651c89a12f97d7870c97c8bd11f Mon Sep 17 00:00:00 2001
From: woopstar <andreas@kruger.nu>
Date: Wed, 18 Apr 2018 10:15:40 +0200
Subject: [PATCH] Properly check need_pip, always run pip to check if needed
pip was always being downloaded on subsequent runs, This PR always runs the pip command, and checks the rc of it before downloading pip
Fix in favor of #2582
---
roles/bootstrap-os/tasks/bootstrap-coreos.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/roles/bootstrap-os/tasks/bootstrap-coreos.yml b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
index 428065eba..be0030538 100644
--- a/roles/bootstrap-os/tasks/bootstrap-coreos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
@@ -22,7 +22,6 @@
failed_when: false
changed_when: false
check_mode: no
- when: need_bootstrap.rc != 0
tags:
- facts
@@ -30,24 +29,24 @@
copy:
src: get-pip.py
dest: ~/get-pip.py
- when: need_pip != 0
+ when: need_pip.rc != 0
- name: Bootstrap | Install pip
shell: "{{ansible_python_interpreter}} ~/get-pip.py"
- when: need_pip != 0
+ when: need_pip.rc != 0
- name: Bootstrap | Remove get-pip.py
file:
path: ~/get-pip.py
state: absent
- when: need_pip != 0
+ when: need_pip.rc != 0
- name: Bootstrap | Install pip launcher
copy:
src: runner
dest: /opt/bin/pip
mode: 0755
- when: need_pip != 0
+ when: need_pip.rc != 0
- name: Install required python modules
pip:
--
GitLab