openstack
/
openstack-ansible-pip_install
Code Issues Proposed changes

Revert "Make initial pip install use constraints" 

This reverts commit 35809a2fff.

Unfortunately this is trying to force a downgrade for
gating which results in failures. I'll need to re-work
this to do things a little differently.

Change-Id: I8d29d5f17c87cfd88847734ab9d96354b7f1706d
This commit is contained in:
Jesse Pretorius (odyssey4me) 2017-07-20 13:31:06 +00:00
parent 35809a2fff
commit 89374c70bb
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/install_source.yml
View File

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

8
tests/test.yml
View File

@ -16,8 +16,10 @@
- name: Playbook for role testing
hosts: localhost
connection: local
vars_files:
- common/test-vars.yml
vars:
pip_packages:
- "pip==8.0.3"
pip_install_upper_constraints: "http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt"
roles:
- role: "pip_install"
post_tasks:
@ -42,4 +44,4 @@
that:
- "pip_dir.stat.isdir"
- "pip_selfcheck_file.stat.exists"
- "pip_version.stdout | search('9.0.1')"
- "pip_version.stdout | search('8.0.3')"