openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Bump ansible-core versions to 2.15 and 2.16"

This commit is contained in:
Zuul 2024-03-14 11:13:42 +00:00 committed by Gerrit Code Review
parent eca8b04363 b04486df07
commit bffed1ab68
9 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/prechecks/vars/main.yml
View File

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

9
doc/source/conf.py
View File

@ -130,7 +130,16 @@ else:
TESTED_RUNTIMES_GOVERNANCE_URL =\
'https://governance.openstack.org/tc/reference/runtimes/{}.html'.format(KOLLA_OPENSTACK_RELEASE)
ANSIBLE_CORE_VERSION_MIN = '2.15'
ANSIBLE_CORE_VERSION_MAX = '2.16'
ANSIBLE_VERSION_MIN = '8'
ANSIBLE_VERSION_MAX = '9'
GLOBAL_VARIABLE_MAP = {
'|ANSIBLE_CORE_VERSION_MIN|': ANSIBLE_CORE_VERSION_MIN,
'|ANSIBLE_CORE_VERSION_MAX|': ANSIBLE_CORE_VERSION_MAX,
'|ANSIBLE_VERSION_MIN|': ANSIBLE_VERSION_MIN,
'|ANSIBLE_VERSION_MAX|': ANSIBLE_VERSION_MAX,
'|KOLLA_OPENSTACK_RELEASE|': KOLLA_OPENSTACK_RELEASE,
'|KOLLA_BRANCH_NAME|': KOLLA_BRANCH_NAME,
'|KOLLA_BRANCH_NAME_DASHED|': KOLLA_BRANCH_NAME.replace('/', '-'),

7
doc/source/user/quickstart-development.rst
View File

@ -90,12 +90,13 @@ Install dependencies for the virtual environment
pip install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
Ansible ``6`` (or ansible-core ``2.14``) and supports up to ``7`` (or
ansible-core ``2.15``).
Ansible ``|ANSIBLE_VERSION_MIN|`` (or ansible-core
``|ANSIBLE_CORE_VERSION_MIN|``) and supports up to ``|ANSIBLE_VERSION_MAX|``
(or ansible-core ``|ANSIBLE_CORE_VERSION_MAX|``).
.. code-block:: console
pip install 'ansible-core>=2.14,<2.16'
pip install 'ansible-core>=|ANSIBLE_CORE_VERSION_MIN|,<|ANSIBLE_CORE_VERSION_MAX|.99'
Install Kolla-ansible
~~~~~~~~~~~~~~~~~~~~~

7
doc/source/user/quickstart.rst
View File

@ -90,12 +90,13 @@ Install dependencies for the virtual environment
pip install -U pip
#. Install `Ansible <http://www.ansible.com>`__. Kolla Ansible requires at least
Ansible ``6`` (or ansible-core ``2.14``) and supports up to ``7`` (or
ansible-core ``2.15``).
Ansible ``|ANSIBLE_VERSION_MIN|`` (or ansible-core
``|ANSIBLE_CORE_VERSION_MIN|``) and supports up to ``|ANSIBLE_VERSION_MAX|``
(or ansible-core ``|ANSIBLE_CORE_VERSION_MAX|``).
.. code-block:: console
pip install 'ansible-core>=2.14,<2.16'
pip install 'ansible-core>=|ANSIBLE_CORE_VERSION_MIN|,<|ANSIBLE_CORE_VERSION_MAX|.99'
Install Kolla-ansible

4
lint-requirements.txt
View File

@ -1,5 +1,5 @@
ansible>=6,<8 # GPLv3
ansible-lint>=6.0.0,<7.0.0 # MIT
ansible>=8,<10 # GPLv3
ansible-lint>=6.22.0,<7.0.0 # MIT
bandit>=1.1.0 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
doc8>=0.6.0 # Apache-2.0

5
releasenotes/notes/ansible-core-2-16-257dc4502ede5b88.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Minimum supported Ansible version is now ``8`` (ansible-core 2.15)
and maximum supported is ``9`` (ansible-core 2.16).

20
tests/run.yml
View File

@ -260,13 +260,6 @@
virtualenv: "{{ kolla_ansible_venv_path }}"
- name: Install kolla-ansible and dependencies
vars:
ansible_core_version_slurp: "==2.13.*"
ansible_core_version_min: "==2.14.*"
ansible_core_version_max: "==2.15.*"
# Test latest ansible version on Ubuntu, minimum supported on others.
ansible_core_version_constraint: >-
{{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }}
pip:
extra_args: "-c {{ upper_constraints_file }}"
name:
@ -277,13 +270,6 @@
# TODO(mnasiadka): Remove in D
- name: Install Ansible on SLURP upgrade only
vars:
ansible_version_slurp: "==6.*"
ansible_version_min: "==7.*"
ansible_version_max: "==8.*"
# Test latest ansible version on Ubuntu, minimum supported on others.
ansible_version_constraint: >-
{{ ansible_version_slurp if is_slurp else ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}
pip:
extra_args: "-c {{ upper_constraints_file }}"
name: "ansible{{ ansible_version_constraint }}"
@ -693,14 +679,8 @@
- name: Upgrade ansible
vars:
ansible_core_version_min: "==2.14.*"
ansible_core_version_max: "==2.15.*"
# Test latest ansible version on Ubuntu, minimum supported on others.
ansible_core_version_constraint: >-
{{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }}
ansible_version_min: "==7.*"
ansible_version_max: "==8.*"
# 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 }}
pip:

4
tools/kolla-ansible
View File

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

21
zuul.d/base.yaml
View File

@ -3,16 +3,21 @@
name: kolla-ansible-variables
vars:
address_family: 'ipv4'
# Test latest ansible version on Ubuntu, minimum supported on others.
# Test latest ansible-core version on Ubuntu, minimum supported on others.
# Use SLURP version (two releases back) on SLURP upgrades.
ansible_core_version_constraint: >-
{{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }}
ansible_core_version_max: "==2.15.*"
ansible_core_version_min: "==2.14.*"
# Test latest ansible version on Ubuntu, minimum supported on others.
{{ ansible_core_version_slurp if is_slurp else ansible_core_version_min if is_upgrade or ansible_facts.distribution != "Ubuntu" else ansible_core_version_max }}
ansible_core_version_slurp: "==2.14.*"
ansible_core_version_max: "==2.16.*"
ansible_core_version_min: "==2.15.*"
# Test latest ansible-core version on Ubuntu, minimum supported on others.
# Use SLURP version (two releases back) on SLURP upgrades.
# TODO(mnasiadka): Remove in D.
ansible_version_constraint: >-
{{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }}
ansible_version_max: "==8.*"
ansible_version_min: "==7.*"
{{ ansible_version_slurp if is_slurp else ansible_version_min if is_upgrade or ansible_facts.distribution != "Ubuntu" else ansible_version_max }}
ansible_version_slurp: "==7.*"
ansible_version_min: "==8.*"
ansible_version_max: "==9.*"
api_interface_name: vxlan0
api_network_prefix: "192.0.2."
api_network_prefix_length: "24"