core: bump ansible version

We should consider bumping ansible version for future releases, so let's
start testing against ansible 2.10

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
index fbfa400550696f6a52f5ed216d82fd3751b3575c..7f044afee830d3c7c3f4a8fa3812440bce7b3885 100644 (file)
--- a/ceph-ansible.spec.in
+++ b/ceph-ansible.spec.in
@@ -15,8 +15,8 @@ Obsoletes:      ceph-iscsi-ansible <= 1.5
 
 BuildArch:      noarch
 
-BuildRequires: ansible >= 2.9
-Requires: ansible >= 2.9
+BuildRequires: ansible >= 2.10
+Requires: ansible >= 2.10
 
 %if 0%{?rhel} == 7
 BuildRequires: python2-devel

diff --git a/requirements.txt b/requirements.txt
index 3769437fd82a0c5e59c54e13cde70fb27f259db7..b8b6274aac01d5f117a8a69634242971e5154a76 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 # These are Python requirements needed to run ceph-ansible master
-ansible>=2.9,<2.10,!=2.9.10
+ansible>=2.10,<2.11,!=2.9.10
 netaddr
 six

diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 62b36089b78cbf3dd077fe6dacdb84194f87d899..19f20b1a9094c89d732832936be788425b8b85d3 100644 (file)
--- 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.9!"
-  when: ansible_version.minor|int != 9
+    msg: "Ansible version must be 2.10!"
+  when: ansible_version.minor|int != 10
 
 - name: fail on unsupported system
   fail:

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 5820c69e0b28faf00af5b393d07120467f8be6f4..474fa6047d9807a956c07a774152b93e49ae0396 100644 (file)
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,7 +2,7 @@
 testinfra>=3,<4
 pytest-xdist==1.28.0
 pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
+ansible>=2.10,<2.11,!=2.9.10
 Jinja2>=2.10
 netaddr
 mock