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 <[email protected]>
ceph · Jan 16, 2024 · 5372dbb · 5372dbb
1 parent 7806e51
commit 5372dbb
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 25 deletions.
diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
@@ -1000,13 +1000,9 @@
 
                 - name: remove package dependencies on redhat
                   command: yum -y autoremove
-                  args:
-                    warn: no
 
                 - name: remove package dependencies on redhat again
                   command: yum -y autoremove
-                  args:
-                    warn: no
               when:
                 ansible_facts['pkg_mgr'] == "yum"
 
@@ -1019,13 +1015,9 @@
 
                 - name: remove package dependencies on redhat
                   command: dnf -y autoremove
-                  args:
-                    warn: no
 
                 - name: remove package dependencies on redhat again
                   command: dnf -y autoremove
-                  args:
-                    warn: no
               when:
                 ansible_facts['pkg_mgr'] == "dnf"
           when:

diff --git 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
@@ -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
@@ -1,4 +1,4 @@
 # These are Python requirements needed to run ceph-ansible main
-ansible-core>=2.12,<2.13
+ansible-core<2.16
 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
@@ -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
@@ -1,8 +1,6 @@
 ---
 - name: check firewalld installation on redhat or SUSE/openSUSE
-  command: rpm -q firewalld
-  args:
-    warn: no
+  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
@@ -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
@@ -6,8 +6,8 @@
 
 - name: fail on unsupported ansible version
   fail:
-    msg: "Ansible version must be 2.12!"
-  when: ansible_version.minor|int != 12
+    msg: "Ansible version must be 2.15!"
+  when: ansible_version.minor|int != 15
 
 - name: fail on unsupported system
   fail:

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -2,8 +2,8 @@
 pytest-testinfra
 pytest-xdist
 pytest
-ansible-core>=2.12,<2.13,!=2.9.10
-Jinja2>=2.10
+ansible-core<2.16
+Jinja2
 netaddr
 mock
 jmespath