tests: test master against ansible 2.7

Let's test ceph-ansible master against ansible 2.7 to catch early any
potential issue with this ansible version.

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

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
index d3ccd93cf46e67e9ee3f2aca7bdcde18887bb3c2..a320ce00ce79343089ee56861e9d3588a4e43b6f 100644 (file)
--- a/ceph-ansible.spec.in
+++ b/ceph-ansible.spec.in
@@ -16,10 +16,10 @@ Obsoletes:      ceph-iscsi-ansible <= 1.5
 
 BuildArch:      noarch
 
-BuildRequires: ansible >= 2.4.2.0
+BuildRequires: ansible >= 2.7
 BuildRequires: python2-devel
 
-Requires: ansible >= 2.4.2.0
+Requires: ansible >= 2.7
 Requires: python-netaddr
 Requires: python-notario >=  0.0.13
 

diff --git a/docs/source/index.rst b/docs/source/index.rst
index 16ca72fa2ee5f2ebb8e5b5be1078c61745ce1b7b..296ab164c2d51fe70046b95e6bb2b22920cd7491 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -75,7 +75,7 @@ The ``master`` branch should be considered experimental and used with caution.
 
 - ``stable-3.1`` Support for Ceph version ``luminous`` and ``mimic``. This branch supports Ansible version ``2.4``.
 
-- ``master`` Support for Ceph versions ``luminous``, and ``mimic``. This branch supports Ansible version ``2.6``.
+- ``master`` Support for Ceph versions ``luminous``, and ``mimic``. This branch supports Ansible version ``2.6`` and ``2.7``.
 
 Configuration and Usage
 =======================

diff --git a/requirements.txt b/requirements.txt
index 323ec45043c5d72986faacfb12041a631886f415..f6dd4ddfeec8ea51cba11d45803956a8255980d6 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 # These are Python requirements needed to run ceph-ansible master
 notario>=0.0.13
-ansible~=2.6,<2.7
-netaddr
\ No newline at end of file
+ansible~=2.7,<2.8
+netaddr

diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
index 1bda37deec5ffd203a0f2a48f63699fe88182370..aa32704fe50ab8723bd51c672412719dee86f27a 100644 (file)
--- a/roles/ceph-validate/tasks/check_system.yml
+++ b/roles/ceph-validate/tasks/check_system.yml
@@ -67,10 +67,10 @@
 
 - name: fail on unsupported ansible version
   fail:
-    msg: "Ansible version must be between 2.5.x and 2.6.x!"
+    msg: "Ansible version must be between 2.6.x and 2.7.x!"
   when:
     - ansible_version.major|int == 2
-    - (ansible_version.minor|int < 5 or ansible_version.minor|int > 6)
+    - (ansible_version.minor|int < 6 or ansible_version.minor|int > 7)
 
 - name: fail if systemd is not present
   fail:

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 12956131cb5d3efae8d27d27d8e07f23463aecd7..81e1445a84f63f776d40fba52817bba866df4c23 100644 (file)
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,5 +3,5 @@ testinfra
 pytest-xdist
 pytest==3.6.1
 notario>=0.0.13
-ansible~=2.6,<2.7
+ansible~=2.7,<2.8
 netaddr