From eb8904e7954bc4325132941c57452d78ad49dc21 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 8 Mar 2024 16:51:10 +0100 Subject: [PATCH] core: bump to ansible 2.15 2.12 is EOL since May 2023. Let's bump to 2.15. Signed-off-by: Guillaume Abrioux --- infrastructure-playbooks/purge-cluster.yml | 8 -------- library/ceph_key.py | 2 -- library/ceph_pool.py | 2 -- requirements.txt | 2 +- .../installs/configure_redhat_repository_installation.yml | 2 -- roles/ceph-infra/tasks/configure_firewall.yml | 2 -- roles/ceph-rgw/tasks/openstack-keystone.yml | 2 -- roles/ceph-validate/tasks/check_system.yml | 4 ++-- tests/requirements.txt | 2 +- 9 files changed, 4 insertions(+), 22 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 92cf99b70..68a42536f 100644 --- 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 index 4f64a4133..c4fda9a73 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 4ed60d62d..01940c721 100644 --- 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.15,<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 index a36355a1b..839b0fad9 100644 --- a/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml +++ b/roles/ceph-common/tasks/installs/configure_redhat_repository_installation.yml @@ -18,7 +18,5 @@ # 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 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 54dbc4ffd..7469584bf 100644 --- 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 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 d40453024..c7bc88879 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.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 index 670f12ec6..4a3dac7ef 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -2,7 +2,7 @@ pytest-testinfra pytest-xdist pytest -ansible-core>=2.12,<2.13 +ansible-core>=2.15,<2.16 Jinja2>=2.10 netaddr mock