mirror of https://github.com/ceph/ceph-ansible.git
doc/tests: bump to ansible 2.9 on master
Add testing against ansible 2.9 on master branch. This commit also updates the documentation. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/5141/head
parent
0f0a14772c
commit
83fdf24caf
|
@ -16,8 +16,8 @@ Obsoletes: ceph-iscsi-ansible <= 1.5
|
|||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: ansible >= 2.8
|
||||
Requires: ansible >= 2.8
|
||||
BuildRequires: ansible >= 2.9
|
||||
Requires: ansible >= 2.9
|
||||
|
||||
%if 0%{?rhel} == 7
|
||||
BuildRequires: python2-devel
|
||||
|
|
|
@ -79,7 +79,9 @@ The ``master`` branch should be considered experimental and used with caution.
|
|||
|
||||
- ``stable-4.0`` Supports Ceph version ``nautilus``. This branch requires Ansible version ``2.8``.
|
||||
|
||||
- ``master`` Supports the master branch of Ceph. This branch requires Ansible version ``2.8``.
|
||||
- ``stable-5.0`` Supports Ceph version ``octopus``. This branch requires Ansible version ``2.9``.
|
||||
|
||||
- ``master`` Supports the master branch of Ceph. This branch requires Ansible version ``2.9``.
|
||||
|
||||
Configuration and Usage
|
||||
=======================
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# These are Python requirements needed to run ceph-ansible master
|
||||
ansible>=2.8.8,<2.9
|
||||
ansible>=2.9,<2.10
|
||||
netaddr
|
||||
|
|
|
@ -6,10 +6,8 @@
|
|||
|
||||
- name: fail on unsupported ansible version
|
||||
fail:
|
||||
msg: "Ansible version must be 2.8 or 2.9!"
|
||||
when:
|
||||
- ansible_version.major|int == 2
|
||||
- ansible_version.minor|int not in [8, 9]
|
||||
msg: "Ansible version must be 2.9!"
|
||||
when: ansible_version.minor|int != 9
|
||||
|
||||
- name: fail on unsupported system
|
||||
fail:
|
||||
|
|
|
@ -3,9 +3,9 @@ six==1.10.0
|
|||
testinfra>=3,<4
|
||||
pytest-xdist==1.28.0
|
||||
pytest>=4.6,<5.0
|
||||
ansible>=2.8.8,<2.9
|
||||
ansible>=2.9,<2.10
|
||||
Jinja2>=2.10
|
||||
netaddr
|
||||
mock
|
||||
jmespath
|
||||
pytest-rerunfailures
|
||||
pytest-rerunfailures
|
||||
|
|
Loading…
Reference in New Issue