openstack/kayobe
Code Issues Proposed changes

Bump up Ansible supported versions to 5.x/6.x

Browse Source 
This change bumps up the maximum supported Ansible version to 6.x
(ansible-core 2.13.x) and minimum to 5.x. This synchronises Kayobe with
Kolla Ansible.

Shebang has been removed from modules due to [1].

os_openstacksdk_version has been added as openstack cloud modules don't
support versions greater than 0.99.

[1]: https://github.com/ansible/ansible/pull/76677

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/867546
Change-Id: Ibb00f6d079442a8509411ae8a71d74fd7bd8cccd
This commit is contained in:
Michal Nasiadka 2022-12-13 09:35:49 +00:00
parent e25e7d64b2
commit 65587cb279
22 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/baremetal-compute-inspect.yml
View File

@ -15,8 +15,7 @@
- role: stackhpc.os_openstacksdk
os_openstacksdk_venv: "{{ venv }}"
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
- name: Ensure baremetal compute nodes are inspected in ironic
hosts: baremetal-compute

3
ansible/baremetal-compute-manage.yml
View File

@ -15,8 +15,7 @@
- role: stackhpc.os_openstacksdk
os_openstacksdk_venv: "{{ venv }}"
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
- name: Ensure baremetal compute nodes are manageable in ironic
hosts: baremetal-compute

3
ansible/baremetal-compute-provide.yml
View File

@ -15,8 +15,7 @@
- role: stackhpc.os_openstacksdk
os_openstacksdk_venv: "{{ venv }}"
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
- name: Ensure baremetal compute nodes are available in ironic
hosts: baremetal-compute

3
ansible/external-net.yml
View File

@ -5,8 +5,7 @@
roles:
- role: stackhpc.os-networks
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
os_networks_venv: "{{ virtualenv_path }}/openstacksdk"
os_networks_openstack_auth_type: "{{ openstack_auth_type }}"
os_networks_openstack_auth: "{{ openstack_auth }}"

3
ansible/inventory/group_vars/all/pip
View File

@ -1,3 +1,6 @@
---
# Upper constraints file for installation of python packages.
pip_upper_constraints_file: "https://releases.openstack.org/constraints/upper/{{ openstack_release }}"
# Upper constraints file for installation of openstacksdk.
openstacksdk_upper_constraints_file: "https://releases.openstack.org/constraints/upper/yoga"

2
ansible/overcloud-introspection-rules-dell-lldp-workaround.yml
View File

@ -126,7 +126,7 @@
roles:
- role: ironic-inspector-rules
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
ironic_inspector_venv: "{{ virtualenv_path }}/openstacksdk"
ironic_inspector_upper_constraints_file: "{{ pip_upper_constraints_file }}"
ironic_inspector_auth_type: "{{ openstack_auth_type }}"

4
ansible/overcloud-introspection-rules.yml
View File

@ -59,9 +59,9 @@
roles:
- role: ironic-inspector-rules
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_state: "latest"
ironic_inspector_venv: "{{ venv }}"
ironic_inspector_upper_constraints_file: "{{ pip_upper_constraints_file }}"
ironic_inspector_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
ironic_inspector_auth_type: "{{ openstack_auth_type }}"
ironic_inspector_auth: "{{ openstack_auth }}"
ironic_inspector_cacert: "{{ openstack_cacert }}"

4
ansible/overcloud-ipa-images.yml
View File

@ -101,9 +101,9 @@
roles:
- role: ipa-images
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_state: "latest"
ipa_images_venv: "{{ virtualenv_path }}/openstacksdk"
ipa_images_upper_constraints_file: "{{ pip_upper_constraints_file }}"
ipa_images_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
ipa_images_openstack_auth_type: "{{ openstack_auth_type }}"
ipa_images_openstack_auth: "{{ openstack_auth }}"
ipa_images_openstack_auth_env: "{{ openstack_auth_env }}"

4
ansible/provision-net.yml
View File

@ -65,8 +65,8 @@
roles:
- role: stackhpc.os-networks
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_networks_upper_constraints_file: "{{ pip_upper_constraints_file }}"
os_openstacksdk_state: "latest"
os_networks_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
os_networks_venv: "{{ venv }}"
os_networks_auth_type: "{{ openstack_auth_type }}"
os_networks_auth: "{{ openstack_auth }}"

2
ansible/roles/console-allocation/library/console_allocation.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python3
# Copyright (c) 2017 StackHPC Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may

2
ansible/roles/ip-allocation/library/ip_allocation.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python3
# Copyright (c) 2017 StackHPC Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may

2
ansible/roles/ipa-images/meta/main.yml
View File

@ -2,7 +2,7 @@
dependencies:
- role: stackhpc.os_openstacksdk
os_openstacksdk_venv: "{{ ipa_images_venv }}"
os_openstacksdk_upper_constraints_file: "{{ ipa_images_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
- role: stackhpc.os-openstackclient
os_openstackclient_venv: "{{ ipa_images_venv }}"
os_openstackclient_upper_constraints_file: "{{ ipa_images_upper_constraints_file }}"

2
ansible/roles/ironic-inspector-rules/library/os_ironic_inspector_rule.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python3
# Copyright (c) 2017 StackHPC Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may

2
ansible/roles/ironic-inspector-rules/meta/main.yml
View File

@ -2,4 +2,4 @@
dependencies:
- role: stackhpc.os_openstacksdk
os_openstacksdk_venv: "{{ ironic_inspector_venv }}"
os_openstacksdk_upper_constraints_file: "{{ ironic_inspector_upper_constraints_file }}"
os_openstacksdk_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"

2
ansible/roles/kolla-ansible/defaults/main.yml
View File

@ -24,7 +24,7 @@ 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>=4,<6.0'
kolla_ansible_venv_ansible: 'ansible>=5,<7.0'
# Path to a requirements.yml file for Ansible collections.
kolla_ansible_requirements_yml: "{{ kolla_ansible_venv }}/share/kolla-ansible/requirements.yml"

2
ansible/roles/kolla-ansible/library/kolla_passwords.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python3
# Copyright (c) 2017 StackHPC Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may

2
ansible/roles/wipe-disks/library/blockdevice_info.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/python3
DOCUMENTATION = '''
---
module: blockdevice_info

4
ansible/seed-introspection-rules.yml
View File

@ -6,9 +6,9 @@
roles:
- role: ironic-inspector-rules
os_openstacksdk_install_epel: "{{ dnf_install_epel }}"
os_openstacksdk_state: latest
os_openstacksdk_state: "latest"
ironic_inspector_venv: "{{ virtualenv_path }}/openstacksdk"
ironic_inspector_upper_constraints_file: "{{ pip_upper_constraints_file }}"
ironic_inspector_upper_constraints_file: "{{ openstacksdk_upper_constraints_file }}"
ironic_inspector_cloud: bifrost
ironic_inspector_rules: "{{ kolla_bifrost_inspector_rules }}"
# These variables may be referenced in the introspection rules.

2
kayobe/plugins/action/merge_configs.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/env python
# Copyright 2015 Sam Yaple
# Copyright 2017 99Cloud Inc.
#

2
kayobe/plugins/action/merge_yaml.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/env python
# Copyright 2015 Sam Yaple
# Copyright 2016 intel
#

6
releasenotes/notes/bump-ansible-6-5d7175aa0d962268.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Updates the maximum supported version of Ansible from 5.x (ansible-core
2.12) to 6.x (ansible-core 2.13). The minimum supported version is updated
from 4.x to 5.x. This is true for both Kayobe and Kolla Ansible.

2
requirements.txt
View File

@ -1,6 +1,6 @@
pbr>=2.0 # Apache-2.0
Jinja2>3 # BSD
ansible>=4,<6.0 # GPLv3
ansible>=5,<7.0 # GPLv3
cliff>=3.1.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT