Fix deprecation warnings.

This commit is contained in:
Ben Kochie 2019-07-01 20:52:19 +02:00
parent 20cee1068f
commit 95a1ab01f6
No known key found for this signature in database
GPG Key ID: 7D88366AC0FCE38A
2 changed files with 12 additions and 14 deletions

View File

@ -1,14 +1,14 @@
---
- name: Add sni support to legacy python installations
include: python_sni.yml
include_tasks: python_sni.yml
when:
- ansible_os_family == 'Debian'
- ansible_python_version is version_compare('2.6.0', '>=')
- ansible_python_version is version_compare('2.7.9', '<')
- include: install-server.yml
- include_tasks: install-server.yml
when: minio_install_server
- include: install-client.yml
- include_tasks: install-client.yml
when: minio_install_client

View File

@ -2,30 +2,28 @@
- name: install python-pip and SNI support packages
package:
name: "{{ item }}"
name:
- python-pip
- python-dev
- libssl-dev
- libffi-dev
state: present
register: _install_python_packages
until: _install_python_packages is succeeded
retries: 5
delay: 2
with_items:
- python-pip
- python-dev
- libssl-dev
- libffi-dev
# There extra pip dependencies are needed to add SSL SNI support to
# Python version prior to 2.7.9. SNI support is needed by the Ansible
# get_url module in server.yml and client.yml.
- name: install the Python SNI python-pip dependencies.
pip:
name: "{{ item }}"
name:
- pyopenssl
- ndg-httpsclient
- pyasn1
state: present
register: _install_pip_packages
until: _install_pip_packages is succeeded
retries: 5
delay: 2
with_items:
- pyopenssl
- ndg-httpsclient
- pyasn1