Add Ansible 5 aka core 2.12 support

Also bumps the minimum to 4.

Change-Id: Ia373f9cc3bb69eba0288bbb3e497e8cadb7cc4d3
This commit is contained in:
Radosław Piliszek 2021-11-24 15:47:27 +00:00
parent 8d3873461f
commit 7372911a19
7 changed files with 17 additions and 12 deletions

View File

@ -1,8 +1,8 @@
---
docker_version_min: '18.09'
docker_py_version_min: '3.4.1'
ansible_version_min: '2.10'
ansible_version_max: '2.11'
ansible_version_min: '2.11'
ansible_version_max: '2.12'
# Top level keys should match ansible_facts.distribution.
# These map to lists of supported releases (ansible_facts.distribution_release) or

View File

@ -89,11 +89,11 @@ If not installing Kolla Ansible in a virtual environment, skip this section.
pip install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
Ansible ``2.10`` and supports up to ``4``.
Ansible ``4`` and supports up to ``5``.
.. code-block:: console
pip install 'ansible<5.0'
pip install 'ansible==5.*'
Install dependencies not using a virtual environment
----------------------------------------------------
@ -121,7 +121,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
sudo pip3 install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
Ansible ``2.10`` and supports up to ``4``.
Ansible ``4`` and supports up to ``5``.
For CentOS or RHEL, run:
@ -138,7 +138,7 @@ If installing Kolla Ansible in a virtual environment, skip this section.
.. note::
If the installed Ansible version does not meet the requirements, one can
use pip: ``sudo pip install -U 'ansible<3.0'``.
use pip: ``sudo pip install -U 'ansible==5.*'``.
Beware system package upgrades might interfere with that so it
is recommended to uninstall the system package first. One might be better
off with the virtual environment method to avoid this pitfall.

View File

@ -22,7 +22,7 @@ python virtual environment on the Ansible control host. For example:
source /path/to/venv/bin/activate
pip install -U pip
pip install kolla-ansible
pip install 'ansible<2.10'
pip install 'ansible==5.*'
deactivate
To use the virtual environment, it should first be activated:

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Minimum supported Ansible version is now ``4`` (ansible-core 2.11)
and maximum supported is ``5`` (ansible-core 2.12).

View File

@ -13,4 +13,4 @@ coverage!=4.4,>=4.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0
ansible>=2.10.0,<5.0 # GPLv3
ansible>=4,<6 # GPLv3

View File

@ -202,8 +202,8 @@
- name: install kolla-ansible and dependencies
vars:
ansible_version_min: "==2.10.*"
ansible_version_max: "==4.*"
ansible_version_min: "==4.*"
ansible_version_max: "==5.*"
# Test latest ansible version on Ubuntu, minimum supported on others.
ansible_version_constraint: >-
{{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}

View File

@ -68,8 +68,8 @@ function check_environment_coherence {
exit 1
fi
local ANSIBLE_VERSION_MIN=2.10
local ANSIBLE_VERSION_MAX=2.11
local ANSIBLE_VERSION_MIN=2.11
local ANSIBLE_VERSION_MAX=2.12
if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] ||
[[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | tail -n1) != "$ANSIBLE_VERSION_MAX" ]]; then