openstack
/
openstack-ansible-pip_install
Code Issues Proposed changes

Merge "Use constraints with get-pip.py" into stable/queens

This commit is contained in:
Zuul 2018-04-02 16:07:38 +00:00 committed by Gerrit Code Review
parent ab5b0f8304 5d6839449e
commit 78e615c712
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/install_offline.yml
View File

@ -65,7 +65,12 @@
- name: pip cache install files locally
local_action: >
command python /tmp/get-pip.py -d '{{ pip_tmp_packages | quote }}' {{ pip_get_pip_options }} {{ pip_packages | map('quote') | join (' ') }}
command python /tmp/get-pip.py
-d '{{ pip_tmp_packages | quote }}'
{{ (pip_install_upper_constraints is defined) |
ternary('--constraint ' ~ pip_install_upper_constraints, '') }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
changed_when: pip_local_cache.stdout.find('Successfully downloaded') != -1
register: pip_local_cache
until: pip_local_cache | success

13
tasks/install_source.yml
View File

@ -16,7 +16,9 @@
- block:
- name: Install PIP
command: >
python /opt/get-pip.py {{ pip_source_install_options }}
python /opt/get-pip.py {{ (pip_install_upper_constraints is defined) |
ternary('--constraint ' ~ pip_install_upper_constraints, '') }}
{{ pip_source_install_options }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
changed_when: pip_install.stdout.find('Successfully installed') != -1
@ -28,9 +30,12 @@
rescue:
- name: Install PIP (fall back mode)
command: >
python /opt/get-pip.py --isolated {{ pip_source_install_options }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
python /opt/get-pip.py --isolated
{{ (pip_install_upper_constraints is defined) |
ternary('--constraint ' ~ pip_install_upper_constraints, '') }}
{{ pip_source_install_options }}
{{ pip_get_pip_options }}
{{ pip_packages | map('quote') | join (' ') }}
changed_when: pip_install_fall_back.stdout.find('Successfully installed') != -1
register: pip_install_fall_back
until: pip_install_fall_back | success