Revert "ansible: bump min to 2.13 and max to 2.14"

This reverts commit 9867060b6b.

Reason for revert: seems this broke some jobs

Change-Id: I1ca81214ece403351c0a522ea05bf07802e4c4c0
This commit is contained in:
Dr. Jens Harbott 2023-04-20 09:26:11 +00:00
parent 9867060b6b
commit b98a71e5d4
6 changed files with 11 additions and 16 deletions

View File

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

View File

@ -90,11 +90,11 @@ Install dependencies for the virtual environment
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 ``6`` and supports up to ``7``. Ansible ``4`` and supports up to ``5``.
.. code-block:: console .. code-block:: console
pip install 'ansible>=6,<8' pip install 'ansible>=4,<6'
Install Kolla-ansible Install Kolla-ansible

View File

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

View File

@ -1,5 +0,0 @@
---
upgrade:
- |
Minimum supported Ansible version is now ``6`` (ansible-core 2.13)
and maximum supported is ``7`` (ansible-core 2.14).

View File

@ -231,20 +231,20 @@
- name: Ensure the latest tested pip - name: Ensure the latest tested pip
pip: pip:
name: "pip==23.*" name: "pip==22.*"
state: latest state: latest
virtualenv: "{{ kolla_ansible_venv_path }}" virtualenv: "{{ kolla_ansible_venv_path }}"
- name: Ensure the latest tested setuptools - name: Ensure the latest tested setuptools
pip: pip:
name: "setuptools==67.2.0" name: "setuptools==65.*"
state: latest state: latest
virtualenv: "{{ kolla_ansible_venv_path }}" virtualenv: "{{ kolla_ansible_venv_path }}"
- name: install kolla-ansible and dependencies - name: install kolla-ansible and dependencies
vars: vars:
ansible_version_min: "==6.*" ansible_version_min: "==5.*"
ansible_version_max: "==7.*" ansible_version_max: "==6.*"
# Test latest ansible version on Ubuntu, minimum supported on others. # Test latest ansible version on Ubuntu, minimum supported on others.
ansible_version_constraint: >- ansible_version_constraint: >-
{{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }} {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}

View File

@ -7,8 +7,8 @@ set -o errexit
# do not use _PYTHON_BIN directly, use $(get_python_bin) instead # do not use _PYTHON_BIN directly, use $(get_python_bin) instead
_PYTHON_BIN="" _PYTHON_BIN=""
ANSIBLE_VERSION_MIN=2.13 ANSIBLE_VERSION_MIN=2.12
ANSIBLE_VERSION_MAX=2.14 ANSIBLE_VERSION_MAX=2.13
function get_python_bin { function get_python_bin {
if [ -n "$_PYTHON_BIN" ]; then if [ -n "$_PYTHON_BIN" ]; then