From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 24 Mar 2020 14:48:58 +0000 (+0100)
Subject: doc/tests: bump to ansible 2.9 on master
X-Git-Tag: v6.0.0alpha2~252
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83fdf24caf601654fb4e985e4fb2e7f834b27234;p=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>
---

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
index e2ceb2ead..9882a8b8a 100644
--- a/ceph-ansible.spec.in
+++ b/ceph-ansible.spec.in
@@ -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
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 6a3437682..3e76c2b70 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -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
 =======================
diff --git a/requirements.txt b/requirements.txt
index 00d745372..8194cc7ae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 32beaa6d6..b459ab345 100644
--- a/roles/ceph-validate/tasks/check_system.yml
+++ b/roles/ceph-validate/tasks/check_system.yml
@@ -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:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index af4437a0c..56417b533 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -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
\ No newline at end of file
+pytest-rerunfailures