diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in index d3ccd93cf..a320ce00c 100644 --- 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 16ca72fa2..296ab164c 100644 --- 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 323ec4504..f6dd4ddfe 100644 --- 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 1bda37dee..aa32704fe 100644 --- 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 12956131c..81e1445a8 100644 --- 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