cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix uri integration test uninstall of urllib3. (#53834)

Browse source
This commit is contained in:
Matt Clay 2019-03-14 21:52:03 -07:00 committed by GitHub
parent 1e595493d9
commit 17ed39a009
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/integration/targets/uri/tasks/main.yml
View file

@ -233,11 +233,18 @@
- result is failed - result is failed
when: result is not skipped when: result is not skipped
- name: check if urllib3 is installed as an OS package
package:
name: "{{ uri_os_packages[ansible_os_family].urllib3 }}"
check_mode: yes
when: not ansible_python.has_sslcontext and not is_ubuntu_precise|bool and uri_os_packages[ansible_os_family].urllib3|default
register: urllib3
- name: uninstall conflicting urllib3 pip package - name: uninstall conflicting urllib3 pip package
pip: pip:
name: urllib3 name: urllib3
state: absent state: absent
when: not ansible_python.has_sslcontext and not is_ubuntu_precise|bool when: not ansible_python.has_sslcontext and not is_ubuntu_precise|bool and uri_os_packages[ansible_os_family].urllib3|default and urllib3.changed
- name: install OS packages that are needed for SNI on old python - name: install OS packages that are needed for SNI on old python
package: package:

3
test/integration/targets/uri/vars/main.yml
View file

@ -1,5 +1,6 @@
uri_os_packages: uri_os_packages:
RedHat: RedHat:
urllib3: python-urllib3
step1: step1:
- python-pyasn1 - python-pyasn1
- pyOpenSSL - pyOpenSSL
@ -16,4 +17,4 @@ uri_os_packages:
step2: step2:
- libffi-dev - libffi-dev
- libssl-dev - libssl-dev
- python-dev - python-dev