mirror of https://github.com/ceph/ceph-ansible.git
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>pull/7474/head
parent
66337a361b
commit
bba9955bf7
|
@ -1,5 +1,3 @@
|
||||||
#!/usr/bin/python3
|
|
||||||
|
|
||||||
# Copyright 2018, Red Hat, Inc.
|
# Copyright 2018, Red Hat, Inc.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
#!/usr/bin/python3
|
|
||||||
|
|
||||||
# Copyright 2020, Red Hat, Inc.
|
# Copyright 2020, Red Hat, Inc.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# These are Python requirements needed to run ceph-ansible main
|
# 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
|
netaddr
|
||||||
six
|
six
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
|
|
||||||
# Remove yum caches so yum doesn't get confused if we are reinstalling a different ceph version
|
# Remove yum caches so yum doesn't get confused if we are reinstalling a different ceph version
|
||||||
- name: purge yum cache
|
- name: purge yum cache
|
||||||
command: yum clean all
|
command: yum clean all #noqa: [303]
|
||||||
args:
|
|
||||||
warn: no
|
|
||||||
changed_when: false
|
changed_when: false
|
||||||
when: ansible_facts['pkg_mgr'] == 'yum'
|
when: ansible_facts['pkg_mgr'] == 'yum'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
- name: check firewalld installation on redhat or SUSE/openSUSE
|
- name: check firewalld installation on redhat or SUSE/openSUSE
|
||||||
command: rpm -q firewalld
|
command: rpm -q firewalld # noqa [303]
|
||||||
register: firewalld_pkg_query
|
register: firewalld_pkg_query
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
check_mode: no
|
check_mode: no
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
|
|
||||||
- name: create nss entries for keystone certificates
|
- name: create nss entries for keystone certificates
|
||||||
shell: "{{ item }}"
|
shell: "{{ item }}"
|
||||||
args:
|
|
||||||
warn: no
|
|
||||||
changed_when: false
|
changed_when: false
|
||||||
with_items:
|
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'"
|
- "openssl x509 -in /etc/keystone/ssl/certs/ca.pem -pubkey | certutil -d {{ radosgw_nss_db_path }} -A -n ca -t 'TCu,Cu,Tuw'"
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
- name: fail on unsupported ansible version
|
- name: fail on unsupported ansible version
|
||||||
fail:
|
fail:
|
||||||
msg: "Ansible version must be 2.14!"
|
msg: "Ansible version must be either 2.15 or 2.16!"
|
||||||
when: ansible_version.minor|int != 14
|
when: ansible_version.minor|int not in [15, 16]
|
||||||
|
|
||||||
- name: fail on unsupported system
|
- name: fail on unsupported system
|
||||||
fail:
|
fail:
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
pytest-testinfra
|
pytest-testinfra
|
||||||
pytest-xdist
|
pytest-xdist
|
||||||
pytest
|
pytest
|
||||||
ansible-core>=2.14,<2.15,!=2.9.10
|
ansible-core>=2.15,<2.17,!=2.9.10
|
||||||
Jinja2>=2.10
|
|
||||||
netaddr
|
netaddr
|
||||||
mock
|
mock
|
||||||
jmespath
|
jmespath
|
||||||
|
|
Loading…
Reference in New Issue