Merge "Remove pip_required_pip_packages var and related tasks"

This commit is contained in:
Zuul 2018-03-25 06:33:26 +00:00 committed by Gerrit Code Review
commit 250b597de7
3 changed files with 5 additions and 29 deletions

View File

@ -50,8 +50,6 @@ pip_packages:
- setuptools
- wheel
pip_required_pip_packages: []
## APT Cache options
cache_timeout: 600

View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The variable ``pip_required_pip_packages`` has been removed as it is not
used and not required.

View File

@ -36,30 +36,3 @@
until: pip_install_fall_back | success
retries: 3
delay: 2
- block:
- name: Install pip packages
pip:
name: "{{ pip_required_pip_packages | map('quote') | join(' ') }}"
state: "{{ pip_install_package_state }}"
extra_args: >-
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options }}
register: install_packages
until: install_packages | success
retries: 5
delay: 2
rescue:
- name: Install pip packages (fall back mode)
pip:
name: "{{ pip_required_pip_packages | map('quote') | join(' ') }}"
state: "{{ pip_install_package_state }}"
extra_args: >-
--isolated
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options }}
register: install_packages_fall_back
until: install_packages_fall_back | success
retries: 5
delay: 2