diff --git a/library/ceph_key.py b/library/ceph_key.py index a444b2d88..492517b21 100644 --- a/library/ceph_key.py +++ b/library/ceph_key.py @@ -1,5 +1,3 @@ -#!/usr/bin/python3 - # Copyright 2018, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/library/ceph_pool.py b/library/ceph_pool.py index 9451a71c3..c04cd1eb1 100644 --- a/library/ceph_pool.py +++ b/library/ceph_pool.py @@ -1,5 +1,3 @@ -#!/usr/bin/python3 - # Copyright 2020, Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/requirements.txt b/requirements.txt index 2148d6058..f1ffe2dc4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ # These are Python requirements needed to run ceph-ansible main -ansible-core>=2.14,<2.15,!=2.9.10 +ansible-core>=2.15,<2.17,!=2.9.10 netaddr six diff --git a/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml b/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml index a36355a1b..86080660f 100644 --- a/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml +++ b/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml @@ -17,8 +17,6 @@ # Remove yum caches so yum doesn't get confused if we are reinstalling a different ceph version - name: purge yum cache - command: yum clean all - args: - warn: no + command: yum clean all #noqa: [303] changed_when: false when: ansible_facts['pkg_mgr'] == 'yum' diff --git a/roles/ceph-infra/tasks/configure_firewall.yml b/roles/ceph-infra/tasks/configure_firewall.yml index 7469584bf..8a0423ce2 100644 --- a/roles/ceph-infra/tasks/configure_firewall.yml +++ b/roles/ceph-infra/tasks/configure_firewall.yml @@ -1,6 +1,6 @@ --- - name: check firewalld installation on redhat or SUSE/openSUSE - command: rpm -q firewalld + command: rpm -q firewalld # noqa [303] register: firewalld_pkg_query ignore_errors: true check_mode: no diff --git a/roles/ceph-rgw/tasks/openstack-keystone.yml b/roles/ceph-rgw/tasks/openstack-keystone.yml index acfe50bb4..d216ee15e 100644 --- a/roles/ceph-rgw/tasks/openstack-keystone.yml +++ b/roles/ceph-rgw/tasks/openstack-keystone.yml @@ -25,8 +25,6 @@ - name: create nss entries for keystone certificates shell: "{{ item }}" - args: - warn: no changed_when: false with_items: - "openssl x509 -in /etc/keystone/ssl/certs/ca.pem -pubkey | certutil -d {{ radosgw_nss_db_path }} -A -n ca -t 'TCu,Cu,Tuw'" diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml index fb4513a1e..0f19d2cdc 100644 --- a/roles/ceph-validate/tasks/check_system.yml +++ b/roles/ceph-validate/tasks/check_system.yml @@ -6,8 +6,8 @@ - name: fail on unsupported ansible version fail: - msg: "Ansible version must be 2.14!" - when: ansible_version.minor|int != 14 + msg: "Ansible version must be either 2.15 or 2.16!" + when: ansible_version.minor|int not in [15, 16] - name: fail on unsupported system fail: diff --git a/tests/requirements.txt b/tests/requirements.txt index 2e55bd36f..b24770e4f 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,8 +2,7 @@ pytest-testinfra pytest-xdist pytest -ansible-core>=2.14,<2.15,!=2.9.10 -Jinja2>=2.10 +ansible-core>=2.15,<2.17,!=2.9.10 netaddr mock jmespath