From 9a5d572a09314d389d758330b76f9d0c99fb06f9 Mon Sep 17 00:00:00 2001
From: Will Szumski <will@stackhpc.com>
Date: Wed, 28 Feb 2024 14:14:45 +0000
Subject: [PATCH] Bump up Ansible supported versions to 8.x/9.x
This change bumps up the maximum supported Ansible version to 9.x
(ansible-core 2.16.x) and minimum to 8.x. This synchronises Kayobe with
Kolla Ansible.
Notable changes
---------------
- Removed use of get_md5 when using stat module, See:
https://github.com/ansible/ansible/commit/d955fb1590efaaf996d7a48746e15f71cc65f583
- Remove use of include (instead of import_tasks/include_tasks) which
has now been removed. See:
https://github.com/ansible/ansible/commit/8db9bd757444fba6dd23fcb067e261d877926a33
Change-Id: I2ea9b2ec58913722c4defffbeee88cc420dcbdab
---
ansible/kolla-ansible.yml | 1 -
ansible/kolla-openstack.yml | 2 --
ansible/overcloud-ipa-images.yml | 2 --
ansible/roles/bootstrap/tasks/main.yml | 1 -
ansible/roles/infra-vms/tasks/deploy.yml | 1 -
ansible/seed-vm-provision.yml | 1 -
releasenotes/notes/bump-ansible-8-19460a447621ff3c.yaml | 6 ++++++
requirements.txt | 4 +---
requirements.yml | 8 ++++----
9 files changed, 11 insertions(+), 15 deletions(-)
create mode 100644 releasenotes/notes/bump-ansible-8-19460a447621ff3c.yaml
diff --git a/ansible/kolla-ansible.yml b/ansible/kolla-ansible.yml
index 8c9b9921..6e3d2ce2 100644
--- a/ansible/kolla-ansible.yml
+++ b/ansible/kolla-ansible.yml
@@ -33,7 +33,6 @@
stat:
path: "{{ kolla_config_path ~ '/.environment' }}"
get_checksum: False
- get_md5: False
mime: False
register: kolla_environment_file
diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 051ef04d..d351cd1b 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -31,7 +31,6 @@
- name: Check for the presence of locally built Ironic Python Agent (IPA) images
stat:
path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ item }}"
- get_md5: False
get_checksum: False
mime: False
with_items: "{{ ipa_images }}"
@@ -52,7 +51,6 @@
local_action:
module: stat
path: "{{ hostvars.localhost.image_cache_path }}"
- get_md5: False
get_checksum: False
mime: False
register: image_cache_stat
diff --git a/ansible/overcloud-ipa-images.yml b/ansible/overcloud-ipa-images.yml
index 0b8242a1..dd70114e 100644
--- a/ansible/overcloud-ipa-images.yml
+++ b/ansible/overcloud-ipa-images.yml
@@ -38,7 +38,6 @@
- name: Check for the presence of locally built Ironic Python Agent (IPA) images
stat:
path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ item }}"
- get_md5: False
get_checksum: False
mime: False
with_items: "{{ ipa_images }}"
@@ -69,7 +68,6 @@
- name: Check whether the image cache directory exists
stat:
path: "{{ image_cache_path }}"
- get_md5: False
get_checksum: False
mime: False
register: image_cache_stat
diff --git a/ansible/roles/bootstrap/tasks/main.yml b/ansible/roles/bootstrap/tasks/main.yml
index a212db94..aaf5abc7 100644
--- a/ansible/roles/bootstrap/tasks/main.yml
+++ b/ansible/roles/bootstrap/tasks/main.yml
@@ -14,7 +14,6 @@
stat:
path: "{{ bootstrap_ssh_private_key_path }}"
get_checksum: False
- get_md5: False
mime: False
register: ssh_key_stat
diff --git a/ansible/roles/infra-vms/tasks/deploy.yml b/ansible/roles/infra-vms/tasks/deploy.yml
index e5199178..214d0be3 100644
--- a/ansible/roles/infra-vms/tasks/deploy.yml
+++ b/ansible/roles/infra-vms/tasks/deploy.yml
@@ -45,7 +45,6 @@
stat:
path: "{{ vm_configdrive_path }}"
get_checksum: False
- get_md5: False
mime: False
register: stat_result
diff --git a/ansible/seed-vm-provision.yml b/ansible/seed-vm-provision.yml
index 34ff0589..41f97996 100644
--- a/ansible/seed-vm-provision.yml
+++ b/ansible/seed-vm-provision.yml
@@ -98,7 +98,6 @@
stat:
path: "{{ seed_vm_configdrive_path }}"
get_checksum: False
- get_md5: False
mime: False
register: stat_result
diff --git a/releasenotes/notes/bump-ansible-8-19460a447621ff3c.yaml b/releasenotes/notes/bump-ansible-8-19460a447621ff3c.yaml
new file mode 100644
index 00000000..406265f0
--- /dev/null
+++ b/releasenotes/notes/bump-ansible-8-19460a447621ff3c.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Updates the maximum supported version of Ansible from 8.x (ansible-core
+ 2.15) to 9.x (ansible-core 2.16). The minimum supported version is updated
+ from 7.x to 8.x. This is true for both Kayobe and Kolla Ansible.
diff --git a/requirements.txt b/requirements.txt
index c2c91269..7d7ba371 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,6 @@
pbr>=2.0 # Apache-2.0
Jinja2>3 # BSD
-ansible>=7,<9.0 # GPLv3
-# NOTE(priteau): Temporary pin while we figure out issues with new ansible-core
-ansible-core<2.15.7 # GPLv3
+ansible>=8,<10 # GPLv3
cliff>=3.1.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT
diff --git a/requirements.yml b/requirements.yml
index 4dc08776..bfb834d4 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -12,16 +12,16 @@ collections:
- name: stackhpc.network
version: 1.0.0
- name: stackhpc.openstack
- version: 0.1.0
+ version: 0.2.1
roles:
- src: ahuffman.resolv
version: 1.3.1
- src: giovtorres.tuned
- version: 1.1.0
+ version: 1.1.1
- src: jriguera.configdrive
# There are no versioned releases of this role.
- version: 29871bf3279ef95fc8f7339b9abd13f869980750
+ version: acd08fd126d0e442ab8b3bc518e37761390d8c2f
- src: MichaelRigart.interfaces
version: v1.14.4
- src: mrlesmithjr.chrony
@@ -45,4 +45,4 @@ roles:
- src: stackhpc.os-ironic-state
version: v1.3.1
- src: stackhpc.timezone
- version: 1.2.1
+ version: 1.2.2
--
GitLab