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>
(cherry picked from commit 839fac8f94)

ceph-ansible.spec.in

@@ -15,8 +15,8 @@ Obsoletes:      ceph-iscsi-ansible <= 1.5
 
 BuildArch:      noarch
 
-BuildRequires: ansible >= 2.9
+BuildRequires: ansible >= 2.10
-Requires: ansible >= 2.9
+Requires: ansible >= 2.10
 
 %if 0%{?rhel} == 7
 BuildRequires: python2-devel

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>=3,<4
 netaddr
 six

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!"
+    msg: "Ansible version must be 2.10!"
-  when: ansible_version.minor|int != 9
+  when: ansible_version.minor|int != 10
 
 - name: fail on unsupported system
   fail:

tests/requirements.txt

@@ -2,10 +2,11 @@
 testinfra>=3,<4
 pytest-xdist==1.28.0
 pytest>=4.6,<5.0
-ansible>=2.9,<2.10,!=2.9.10
+ansible>=3,<4
 Jinja2>=2.10
 netaddr
 mock
 jmespath
 pytest-rerunfailures<9.0
 pytest-cov
+six

tox-subset_update.ini

@@ -32,7 +32,6 @@ setenv=
   UPDATE_CEPH_DEV_BRANCH = master
   UPDATE_CEPH_DEV_SHA1 = latest
   ROLLING_UPDATE = True
-deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/subset_update{env:CONTAINER_DIR:}
 commands=
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
@@ -55,6 +54,7 @@ commands=
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "'
 
+  pip install -r {toxinidir}/tests/requirements.txt
 # upgrade mons
 # mon1
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\

tox-update.ini

@@ -31,7 +31,6 @@ setenv=
   CEPH_DOCKER_IMAGE_TAG = latest-octopus
   UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-pacific
   ROLLING_UPDATE = True
-deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
 commands=
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
@@ -62,7 +61,7 @@ commands=
       ceph_nfs_rgw_access_key=fake_access_key \
       ceph_nfs_rgw_secret_key=fake_secret_key \
   "'
-
+  pip install -r {toxinidir}/tests/requirements.txt
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
       ceph_docker_registry_auth=True \