From 80830114448ce3ec96c501705cee4d4eba36db58 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Tue, 11 Jun 2024 09:54:42 +0100 Subject: [PATCH] Update ansible to 2.17.1 This required installing a newer python on Rocky/Centos-9 as the system python is too old for a new release ansible. python3.12 is used in the ansible-runtime venv, but the normal system python is still used for the openstack services. Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/921837 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible/+/921976 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_swift/+/922283 Change-Id: If0df26247a44ca34c98532864b442f84d7a8ffd0 --- scripts/bootstrap-ansible.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 6d16773459..8685baf26f 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -22,7 +22,7 @@ set -e -u -x export HTTP_PROXY=${HTTP_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""} # The Ansible version used for testing -export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.15.9"} +export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.17.1"} export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"} export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"} export USER_COLLECTION_FILE=${USER_COLLECTION_FILE:-"user-collection-requirements.yml"} @@ -70,8 +70,8 @@ case ${DISTRO_ID} in rocky) case ${DISTRO_VERSION_ID} in 9|9.[0-9]*) - dnf -y install python3 python3-devel python3-libselinux - PYTHON_EXEC_PATH="$(command -v python3)" + dnf -y install python3.12 python3.12-pip python3.12-devel python3 python3-devel python3-libselinux + PYTHON_EXEC_PATH="$(command -v python3.12)" OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3" ;; esac @@ -79,8 +79,9 @@ case ${DISTRO_ID} in centos|rhel) case ${DISTRO_VERSION_ID} in 9) - dnf -y install python3 python3-devel libselinux-python3 - PYTHON_EXEC_PATH="$(command -v python3)" + dnf -y install python3.12 python3.12-pip python3.12-devel python3 python3-devel libselinux-python3 + PYTHON_EXEC_PATH="$(command -v python3.12)" + OSA_ANSIBLE_PYTHON_INTERPRETER="/usr/bin/python3" ;; esac ;;