bump ansible-core to 2.16

- Remove python3 shebangs
- command module warn parameter is deprecated since 2.11 and removed
  from 2.14

Signed-off-by: Teoman ONAY <tonay@ibm.com>

diff --git a/library/ceph_key.py b/library/ceph_key.py
index a444b2d883d1c31e899974aa669aec8290fe42bb..492517b2137d004ebfd3266f198930f9725bc4f6 100644 (file)
--- 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 9451a71c398ace7ace0f610f01961e349e21e831..c04cd1eb14e14e158f1b789b834104460da3772c 100644 (file)
--- 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 2148d6058310964fa80f878738c5432e323a091b..f1ffe2dc4fe0524419c2eb326ec69e35c7dca81c 100644 (file)
--- 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 a36355a1bb12cbf0e22cf69b9d6363505182dab4..86080660f21159b3d2190a54749054f9a03d5c2f 100644 (file)
--- 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 7469584bfbab9e7c6301edda3aebb9414434f26d..8a0423ce209d069ead124a22fa1dae7e10c7aa72 100644 (file)
--- 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 acfe50bb4e097be3f233a9da71866c6226be088c..d216ee15e374ddd70dde35bc4d924fd796f82a5e 100644 (file)
--- 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 fb4513a1eb0e2bac5dce06be7aa57f85228646aa..0f19d2cdc653a6ac8c4f635ff51e33dd459cdade 100644 (file)
--- 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 2e55bd36fd8b18d4602a736e2930291cfe0806e3..b24770e4ffaf224d2d057e019f13129b68d61ae0 100644 (file)
--- 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