Bump minimum Ansible version to 2.9

Change-Id: I5befc72a4894d625ca352b27df9d3aa84a2f5b2c
This commit is contained in:
Pierre Riteau 2020-09-23 17:48:01 +02:00
parent cccfa8f378
commit c5c6d995d3
7 changed files with 11 additions and 6 deletions

View File

@ -1,7 +1,7 @@
--- ---
docker_version_min: '1.10.0' docker_version_min: '1.10.0'
docker_py_version_min: '2.0.0' docker_py_version_min: '2.0.0'
ansible_version_min: '2.8' ansible_version_min: '2.9'
ansible_version_max: '2.9' ansible_version_max: '2.9'
# Top level keys should match ansible_distribution. # Top level keys should match ansible_distribution.

View File

@ -79,7 +79,7 @@ If not installing Kolla Ansible in a virtual environment, skip this section.
pip install -U pip pip install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least #. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
Ansible ``2.8`` and supports up to ``2.9``. Ansible ``2.9`` and supports up to ``2.9``.
.. code-block:: console .. code-block:: console

View File

@ -1,5 +1,5 @@
alabaster==0.7.10 alabaster==0.7.10
ansible==2.8.0 ansible==2.9.0
appdirs==1.4.3 appdirs==1.4.3
asn1crypto==0.24.0 asn1crypto==0.24.0
Babel==2.5.3 Babel==2.5.3

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Kolla-Ansible now requires Ansible ``2.9``. Ansible ``2.8`` is not
supported anymore.

View File

@ -13,4 +13,4 @@ coverage!=4.4,>=4.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0 docker>=2.4.2 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0
ansible>=2.8.0 # GPLv3 ansible>=2.9.0 # GPLv3

View File

@ -197,7 +197,7 @@
- name: install kolla-ansible and dependencies - name: install kolla-ansible and dependencies
vars: vars:
# Test latest ansible version on Ubuntu, minimum supported on others. # Test latest ansible version on Ubuntu, minimum supported on others.
ansible_version_constraint: "{{ '==2.9.*,!=2.9.8,!=2.9.12' if base_distro == 'ubuntu' else '==2.8.*,!=2.8.14' }}" ansible_version_constraint: "==2.9.*"
pip: pip:
name: name:
- "{{ kolla_ansible_src_dir }}" - "{{ kolla_ansible_src_dir }}"

View File

@ -54,7 +54,7 @@ function check_environment_coherence {
exit 1 exit 1
fi fi
local ANSIBLE_VERSION_MIN=2.8 local ANSIBLE_VERSION_MIN=2.9
local ANSIBLE_VERSION_MAX=2.9 local ANSIBLE_VERSION_MAX=2.9
if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] || if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] ||