From fd0b9491b60303a5d27f79226f30d51c438de2ff Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 24 Aug 2020 15:50:16 -0400 Subject: [PATCH] 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 --- ceph-ansible.spec.in | 4 ++-- requirements.txt | 2 +- roles/ceph-validate/tasks/check_system.yml | 4 ++-- tests/requirements.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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/requirements.txt b/requirements.txt index 00d745372..9dbf90ae2 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,!=2.9.10 netaddr diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml index 5e6072812..5592b7b00 100644 --- 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 af4437a0c..d79bb55cc 100644 --- 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 -- 2.39.5