ansible: bump to ansible 2.9

Prior this commit we were supporting both ansible 2.8 and 2.9.
Let's drop 2.8 now.

Closes: #5459
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1879178
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
index e2ceb2ead709b1cbca6e8a7924601eae678b76b5..9882a8b8a0a1862cab5a09a934dbcb6b87c56f4d 100644 (file)
--- 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/requirements.txt b/requirements.txt
index 00d745372eb19951667ae2aa0c4e818416a4ca7e..9dbf90ae2ca3fd88ffadfff5c7597c216c115842 100644 (file)
--- 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,!=2.9.10
 netaddr

diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 5e60728124d07ca5538bcd3e35f4dee21b0a97e9..5592b7b006d23f54e77e48a7f22f6612d20d1565 100644 (file)
--- a/roles/ceph-validate/tasks/check_system.yml
+++ b/roles/ceph-validate/tasks/check_system.yml
@@ -6,10 +6,10 @@
 
 - name: fail on unsupported ansible version
   fail:
-    msg: "Ansible version must be 2.8 or 2.9!"
+    msg: "Ansible version must be 2.9!"
   when:
     - ansible_version.major|int == 2
-    - ansible_version.minor|int not in [8, 9]
+    - ansible_version.minor|int != 9
 
 - name: fail on unsupported system
   fail:

diff --git a/tests/requirements.txt b/tests/requirements.txt
index af4437a0c59536aba4e3be44e57d67f6e9470adb..d79bb55cc317cc09c5489a7b8daac4f8ccd5160a 100644 (file)
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,7 +3,7 @@ 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,!=2.9.10
 Jinja2>=2.10
 netaddr
 mock