From 8c8adb0e4543f14c3d1727013cb4dfc0cc322975 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 12 Aug 2019 10:32:38 +0100
Subject: [PATCH] Update minimum version of Ansible to 2.6

This is required for the dict2items filter.

Change-Id: I60a04e839bf06506ff36c2631a286130d5fde972
---
 ansible/roles/prechecks/vars/main.yml                    | 2 +-
 doc/source/user/quickstart.rst                           | 4 ++--
 releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml | 4 ++++
 tools/setup_gate.sh                                      | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml

diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 21f721ec8b..8d673d5361 100644
--- a/ansible/roles/prechecks/vars/main.yml
+++ b/ansible/roles/prechecks/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 docker_version_min: '1.10.0'
 docker_py_version_min: '2.0.0'
-ansible_version_min: '2.5.0'
+ansible_version_min: '2.6.0'
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index e31e342d03..df7a058c65 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -90,7 +90,7 @@ If not installing Kolla Ansible in a virtual environment, skip this section.
       pip install -U pip
 
 #. Install `Ansible <http://www.ansible.com>`__. Currently, Kolla Ansible
-   requires Ansible 2.5+.
+   requires Ansible 2.6+.
 
    .. code-block:: console
 
@@ -122,7 +122,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
       sudo pip install -U pip
 
 #. Install `Ansible <http://www.ansible.com>`__. Currently, Kolla Ansible
-   requires Ansible 2.5+.
+   requires Ansible 2.6+.
 
    For CentOS or RHEL, run:
 
diff --git a/releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml b/releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml
new file mode 100644
index 0000000000..19424a7261
--- /dev/null
+++ b/releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Updates the minimum required version of Ansible to 2.6.
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 758214094c..9ef8c6b88c 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -113,9 +113,9 @@ function setup_ansible {
 
     # Test latest ansible version on Ubuntu, minimum supported on others.
     if [[ $BASE_DISTRO == "ubuntu" ]]; then
-        ANSIBLE_VERSION=">=2.5"
+        ANSIBLE_VERSION=">=2.6"
     else
-        ANSIBLE_VERSION="<2.6"
+        ANSIBLE_VERSION="<2.7"
     fi
 
     # TODO(SamYaple): Move to virtualenv