commit
76a2df8045
|
@ -12,9 +12,8 @@ services:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- ANSIBLE=2.4
|
- ANSIBLE=2.7
|
||||||
- ANSIBLE=2.5
|
- ANSIBLE=2.8
|
||||||
- ANSIBLE=2.6
|
|
||||||
|
|
||||||
# Install tox
|
# Install tox
|
||||||
install:
|
install:
|
||||||
|
|
|
@ -28,7 +28,7 @@ galaxy_info:
|
||||||
- system
|
- system
|
||||||
- minio
|
- minio
|
||||||
- storage
|
- storage
|
||||||
- object-storage
|
- objectstorage
|
||||||
- s3
|
- s3
|
||||||
|
|
||||||
dependencies: []
|
dependencies: []
|
||||||
|
|
|
@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def AnsibleDefaults(Ansible):
|
def AnsibleDefaults():
|
||||||
with open("../../defaults/main.yml", 'r') as stream:
|
with open("../../defaults/main.yml", 'r') as stream:
|
||||||
return yaml.load(stream)
|
return yaml.load(stream)
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def AnsibleDefaults(Ansible):
|
def AnsibleDefaults():
|
||||||
with open("../../defaults/main.yml", 'r') as stream:
|
with open("../../defaults/main.yml", 'r') as stream:
|
||||||
return yaml.load(stream)
|
return yaml.load(stream)
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def AnsibleDefaults(Ansible):
|
def AnsibleDefaults():
|
||||||
with open("../../defaults/main.yml", 'r') as stream:
|
with open("../../defaults/main.yml", 'r') as stream:
|
||||||
return yaml.load(stream)
|
return yaml.load(stream)
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: Add sni support to legacy python installations
|
- name: Add sni support to legacy python installations
|
||||||
include: python_sni.yml
|
include_tasks: python_sni.yml
|
||||||
when:
|
when:
|
||||||
- ansible_os_family == 'Debian'
|
- ansible_os_family == 'Debian'
|
||||||
- ansible_python_version is version_compare('2.6.0', '>=')
|
- ansible_python_version is version_compare('2.6.0', '>=')
|
||||||
- ansible_python_version is version_compare('2.7.9', '<')
|
- ansible_python_version is version_compare('2.7.9', '<')
|
||||||
|
|
||||||
- include: install-server.yml
|
- include_tasks: install-server.yml
|
||||||
when: minio_install_server
|
when: minio_install_server
|
||||||
|
|
||||||
- include: install-client.yml
|
- include_tasks: install-client.yml
|
||||||
when: minio_install_client
|
when: minio_install_client
|
||||||
|
|
|
@ -2,30 +2,28 @@
|
||||||
|
|
||||||
- name: install python-pip and SNI support packages
|
- name: install python-pip and SNI support packages
|
||||||
package:
|
package:
|
||||||
name: "{{ item }}"
|
name:
|
||||||
|
- python-pip
|
||||||
|
- python-dev
|
||||||
|
- libssl-dev
|
||||||
|
- libffi-dev
|
||||||
state: present
|
state: present
|
||||||
register: _install_python_packages
|
register: _install_python_packages
|
||||||
until: _install_python_packages is succeeded
|
until: _install_python_packages is succeeded
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
with_items:
|
|
||||||
- python-pip
|
|
||||||
- python-dev
|
|
||||||
- libssl-dev
|
|
||||||
- libffi-dev
|
|
||||||
|
|
||||||
# There extra pip dependencies are needed to add SSL SNI support to
|
# 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
|
# Python version prior to 2.7.9. SNI support is needed by the Ansible
|
||||||
# get_url module in server.yml and client.yml.
|
# get_url module in server.yml and client.yml.
|
||||||
- name: install the Python SNI python-pip dependencies.
|
- name: install the Python SNI python-pip dependencies.
|
||||||
pip:
|
pip:
|
||||||
name: "{{ item }}"
|
name:
|
||||||
|
- pyopenssl
|
||||||
|
- ndg-httpsclient
|
||||||
|
- pyasn1
|
||||||
state: present
|
state: present
|
||||||
register: _install_pip_packages
|
register: _install_pip_packages
|
||||||
until: _install_pip_packages is succeeded
|
until: _install_pip_packages is succeeded
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
with_items:
|
|
||||||
- pyopenssl
|
|
||||||
- ndg-httpsclient
|
|
||||||
- pyasn1
|
|
||||||
|
|
14
tox.ini
14
tox.ini
|
@ -1,22 +1,18 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 1.8
|
minversion = 1.8
|
||||||
envlist = py{27}-ansible{23,24,25,26}
|
envlist = py{27}-ansible{27,28}
|
||||||
skipsdist = true
|
skipsdist = true
|
||||||
|
|
||||||
[travis:env]
|
[travis:env]
|
||||||
ANSIBLE=
|
ANSIBLE=
|
||||||
2.3: ansible23
|
2.7: ansible27
|
||||||
2.4: ansible24
|
2.8: ansible28
|
||||||
2.5: ansible25
|
|
||||||
2.6: ansible26
|
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
passenv = *
|
passenv = *
|
||||||
deps =
|
deps =
|
||||||
-rtest-requirements.txt
|
-rtest-requirements.txt
|
||||||
ansible23: ansible<2.4
|
ansible27: ansible<2.8
|
||||||
ansible24: ansible<2.5
|
ansible28: ansible<2.9
|
||||||
ansible25: ansible<2.6
|
|
||||||
ansible26: ansible<2.7
|
|
||||||
commands =
|
commands =
|
||||||
{posargs:molecule test --all --destroy always}
|
{posargs:molecule test --all --destroy always}
|
||||||
|
|
Loading…
Reference in New Issue