Skip to content

Commit

Permalink
Bump up Ansible supported versions to 6.x/7.x
Browse files Browse the repository at this point in the history
This change bumps up the maximum supported Ansible version to 7.x
(ansible-core 2.14.x) and minimum to 6.x (ansible-core 2.13.x).
This synchronises Kayobe with Kolla Ansible.

Change-Id: Ibffecaa8085bd38ebc8cded9a4bfebe77d59d515
  • Loading branch information
bbezak authored and mnasiadka committed May 25, 2023
1 parent d801896 commit 773eead
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ansible/roles/kolla-ansible/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ kolla_ansible_venv_extra_requirements: []
# Pip requirement specifier for the ansible package. NOTE: This limits the
# version of ansible used by kolla-ansible to avoid new releases from breaking
# tested code. Changes to this limit should be tested.
kolla_ansible_venv_ansible: 'ansible>=5,<7.0'
kolla_ansible_venv_ansible: 'ansible>=6,<8.0'
kolla_ansible_venv_ansible_core: 'ansible-core>=2.13,<=2.14.2'

# Path to a requirements.yml file for Ansible collections.
kolla_ansible_requirements_yml: "{{ kolla_ansible_venv }}/share/kolla-ansible/requirements.yml"
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/kolla-ansible/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
{% else %}
kolla-ansible=={{ kolla_openstack_release }}
{% endif %}
- "{{ kolla_ansible_venv_ansible_core }}"
- "{{ kolla_ansible_venv_ansible }}"
- selinux
pip:
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/ansible-update-7-e90e58f6d7497c0e.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
upgrade:
- |
Updates the maximum supported version of Ansible from 6.x (ansible-core
2.13) to 7.x (ansible-core 2.14). The minimum supported version is updated
from 5.x to 6.x. This is true for both Kayobe and Kolla Ansible.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pbr>=2.0 # Apache-2.0
Jinja2>3 # BSD
ansible>=5,<7.0 # GPLv3
ansible>=6,<8.0 # GPLv3
cliff>=3.1.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT
Expand Down

0 comments on commit 773eead

Please sign in to comment.