From 0a769dc30b34b6f726af151d72c51ad9e50717d0 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Sat, 29 Jun 2019 11:08:27 +0100
Subject: [PATCH] Bump minimum Ansible version to 2.5
This is necessary for some Ansible tests which were renamed in 2.5 -
including 'version' and 'successful'.
Change-Id: Iacf88ef5589c7571fcf56ba8b99d3dbe76975195
---
ansible/roles/prechecks/vars/main.yml | 2 +-
doc/source/user/quickstart.rst | 4 ++--
releasenotes/notes/ansible-min-2.5-7fa76f625bf9f359.yaml | 4 ++++
tools/setup_gate.sh | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 releasenotes/notes/ansible-min-2.5-7fa76f625bf9f359.yaml
diff --git a/ansible/roles/prechecks/vars/main.yml b/ansible/roles/prechecks/vars/main.yml
index 1480eda171..21f721ec8b 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.4.0'
+ansible_version_min: '2.5.0'
diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst
index 78b69e030d..d98ed7247c 100644
--- a/doc/source/user/quickstart.rst
+++ b/doc/source/user/quickstart.rst
@@ -96,7 +96,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.4+.
+ requires Ansible 2.5+.
.. code-block:: console
@@ -128,7 +128,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.4+.
+ requires Ansible 2.5+.
For CentOS or RHEL, run:
diff --git a/releasenotes/notes/ansible-min-2.5-7fa76f625bf9f359.yaml b/releasenotes/notes/ansible-min-2.5-7fa76f625bf9f359.yaml
new file mode 100644
index 0000000000..24bd47b243
--- /dev/null
+++ b/releasenotes/notes/ansible-min-2.5-7fa76f625bf9f359.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ Updates the minimum required version of Ansible to 2.5.
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 0d0a53817d..d68f177580 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -92,7 +92,7 @@ function setup_ansible {
RAW_INVENTORY=/etc/kolla/inventory
# TODO(SamYaple): Move to virtualenv
- sudo -H pip install -U "ansible>=2.4" "docker>=2.0.0" "python-openstackclient" "ara<1.0.0" "cmd2<0.9.0"
+ sudo -H pip install -U "ansible>=2.5" "docker>=2.0.0" "python-openstackclient" "ara<1.0.0" "cmd2<0.9.0"
if [[ $ACTION == "zun" ]]; then
sudo -H pip install -U "python-zunclient"
fi