Skip to content

Commit

Permalink
bump ansible-core to 2.16
Browse files Browse the repository at this point in the history
- Remove python3 shebangs
- command module warn parameter is deprecated since 2.11 and removed
  from 2.14

Signed-off-by: Teoman ONAY <[email protected]>
  • Loading branch information
asm0deuz authored and guits committed Feb 13, 2024
1 parent 987afd6 commit 951ccfb
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 15 deletions.
2 changes: 0 additions & 2 deletions library/ceph_key.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/usr/bin/python3

# Copyright 2018, Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 0 additions & 2 deletions library/ceph_pool.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/usr/bin/python3

# Copyright 2020, Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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.16,!=2.9.10
netaddr
six
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion roles/ceph-infra/tasks/configure_firewall.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions roles/ceph-rgw/tasks/openstack-keystone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
4 changes: 2 additions & 2 deletions roles/ceph-validate/tasks/check_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 2.16!"
when: ansible_version.minor|int != 16

- name: fail on unsupported system
fail:
Expand Down
3 changes: 1 addition & 2 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.16,!=2.9.10
netaddr
mock
jmespath
Expand Down

0 comments on commit 951ccfb

Please sign in to comment.