From cefbe593d6da29e5d0cad9f2800ba9fad4d40a72 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 1 Jul 2019 14:37:26 +0200 Subject: [PATCH 1/5] Fix Travis errors. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 619d74f..c8acdd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,8 @@ services: env: matrix: - - ANSIBLE=2.4 - - ANSIBLE=2.5 - - ANSIBLE=2.6 + - ANSIBLE=2.7 + - ANSIBLE=2.8 # Install tox install: From e2dfa522a8cb84994577feccc7a80f9a5a7d1adf Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 1 Jul 2019 14:39:41 +0200 Subject: [PATCH 2/5] Fix lint error. --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index cc89247..813d2fc 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -28,7 +28,7 @@ galaxy_info: - system - minio - storage - - object-storage + - objectstorage - s3 dependencies: [] From 20cee1068fe1ac99743df7c53b03e20a632e5c19 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 1 Jul 2019 14:53:17 +0200 Subject: [PATCH 3/5] Update tox.ini --- tox.ini | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tox.ini b/tox.ini index 56fd2aa..e2a3667 100644 --- a/tox.ini +++ b/tox.ini @@ -1,22 +1,18 @@ [tox] minversion = 1.8 -envlist = py{27}-ansible{23,24,25,26} +envlist = py{27}-ansible{27,28} skipsdist = true [travis:env] ANSIBLE= - 2.3: ansible23 - 2.4: ansible24 - 2.5: ansible25 - 2.6: ansible26 + 2.7: ansible27 + 2.8: ansible28 [testenv] passenv = * deps = -rtest-requirements.txt - ansible23: ansible<2.4 - ansible24: ansible<2.5 - ansible25: ansible<2.6 - ansible26: ansible<2.7 + ansible27: ansible<2.8 + ansible28: ansible<2.9 commands = {posargs:molecule test --all --destroy always} From 95a1ab01f6ec9de565dd28ad36a698c7b396523e Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 1 Jul 2019 20:52:19 +0200 Subject: [PATCH 4/5] Fix deprecation warnings. --- tasks/main.yml | 6 +++--- tasks/python_sni.yml | 20 +++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 4abb3ca..f49d6da 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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 diff --git a/tasks/python_sni.yml b/tasks/python_sni.yml index 21e462e..c131e20 100644 --- a/tasks/python_sni.yml +++ b/tasks/python_sni.yml @@ -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 From 796f703c176e1b69bb905ab555309ec87113a720 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 1 Jul 2019 20:54:24 +0200 Subject: [PATCH 5/5] Fix molecule setup. --- molecule/alternative/tests/test_minio_alternative.py | 2 +- molecule/cluster/tests/test_minio_cluster.py | 2 +- molecule/default/tests/test_minio_default.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/molecule/alternative/tests/test_minio_alternative.py b/molecule/alternative/tests/test_minio_alternative.py index a809115..4ad6e7b 100644 --- a/molecule/alternative/tests/test_minio_alternative.py +++ b/molecule/alternative/tests/test_minio_alternative.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.fixture() -def AnsibleDefaults(Ansible): +def AnsibleDefaults(): with open("../../defaults/main.yml", 'r') as stream: return yaml.load(stream) diff --git a/molecule/cluster/tests/test_minio_cluster.py b/molecule/cluster/tests/test_minio_cluster.py index 11841a1..5775c5a 100644 --- a/molecule/cluster/tests/test_minio_cluster.py +++ b/molecule/cluster/tests/test_minio_cluster.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.fixture() -def AnsibleDefaults(Ansible): +def AnsibleDefaults(): with open("../../defaults/main.yml", 'r') as stream: return yaml.load(stream) diff --git a/molecule/default/tests/test_minio_default.py b/molecule/default/tests/test_minio_default.py index 397a96e..5f55c9e 100644 --- a/molecule/default/tests/test_minio_default.py +++ b/molecule/default/tests/test_minio_default.py @@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.fixture() -def AnsibleDefaults(Ansible): +def AnsibleDefaults(): with open("../../defaults/main.yml", 'r') as stream: return yaml.load(stream)