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 839fac8f9418ce54af66a4ff0a3a9b8db6814f26)

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

diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 44a37fa04637c2c840153d72051223945e913b24..dc8cdd6fd92bd9d1e4d4515cc4ab0a1d80c7e756 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..b2c5d77c2487061d111be3402cf9bb619166c556 100644 (file)
--- a/tests/requirements.txt
+++ b/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
\ No newline at end of file

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index ebdf8d3f18f25a131c224f6439d1b8f64f1e1cc5..3762181bb1b4c2b43556881758c25f88b4891e4d 100644 (file)
--- a/tox-subset_update.ini
+++ b/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 "\

diff --git a/tox-update.ini b/tox-update.ini
index 1e8bf4c28081868f3df08033a649e1cc9bc7a2b0..24669b295b17c8f94c3f376caf10550c259f949e 100644 (file)
--- a/tox-update.ini
+++ b/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 \