zuul/zuul-jobs
Code Issues Proposed changes

ensure-pip: update include to include_tasks

Browse Source 
include is being deprecated and import_tasks is supported
since 2.4 so update bindep to use that instead.

Change-Id: I21670d7d687b81ac745a74cf43cbe747eefde08c
This commit is contained in:
Albin Vass
2020-05-25 20:35:56 +02:00
parent 8df1e02752
commit 58381f58f1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ensure-pip/tasks/main.yaml
View File

@@ -27,7 +27,7 @@
failed_when: false failed_when: false
- name: Install pip from packages - name: Install pip from packages
include: "{{ zj_distro_os }}" include_tasks: "{{ zj_distro_os }}"
with_first_found: with_first_found:
- "{{ ansible_distribution_release }}.yaml" - "{{ ansible_distribution_release }}.yaml"
- "{{ ansible_distribution }}.yaml" - "{{ ansible_distribution }}.yaml"
@@ -40,10 +40,10 @@
loop_var: zj_distro_os loop_var: zj_distro_os
- name: Include workarounds - name: Include workarounds
include: workarounds.yaml import_tasks: workarounds.yaml
- name: Install pip from source - name: Install pip from source
include: source.yaml include_tasks: source.yaml
when: when:
- ensure_pip_from_upstream - ensure_pip_from_upstream
- pip_preinstalled.rc != 0 - pip_preinstalled.rc != 0