aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2019-08-12 10:32:38 +0100
committerMark Goddard <mark@stackhpc.com>2019-09-11 17:09:32 +0100
commit8c8adb0e4543f14c3d1727013cb4dfc0cc322975 (patch)
treeb10edaadbc5b6695c4bdbce94d5aa4d15decc475
parent15ce0e060004ee0a00338af6734a0b519b8a0af4 (diff)
downloadkolla-ansible-8c8adb0e4543f14c3d1727013cb4dfc0cc322975.tar.gz
kolla-ansible-8c8adb0e4543f14c3d1727013cb4dfc0cc322975.zip
Update minimum version of Ansible to 2.6
This is required for the dict2items filter. Change-Id: I60a04e839bf06506ff36c2631a286130d5fde972
-rw-r--r--ansible/roles/prechecks/vars/main.yml2
-rw-r--r--doc/source/user/quickstart.rst4
-rw-r--r--releasenotes/notes/ansible-min-2.6-4b96795a1cc4b6b2.yaml4
-rwxr-xr-xtools/setup_gate.sh4
4 files changed, 9 insertions, 5 deletions
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 21f721ec8..8d673d536 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 e31e342d0..df7a058c6 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 000000000..19424a726
--- /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 758214094..9ef8c6b88 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