mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Fix uri integration test uninstall of urllib3. (#53834)
This commit is contained in:
parent
1e595493d9
commit
17ed39a009
2 changed files with 10 additions and 2 deletions
|
@ -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:
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue