Skip to content

Commit 8c979cd

Browse files
sjpbwtripp180901
andauthored
Fix python/ansible/pulp squeezer versions for RL8 deploy hosts (#516)
* fix python/ansible/pulp squeezer versions for RL8 deploy hosts * fixed broken pulp dependency --------- Co-authored-by: wtripp180901 <[email protected]>
1 parent 9a07ff4 commit 8c979cd

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

ansible/filter_plugins/utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ def to_ood_regex(items):
4141
eg {{ [compute-001, compute-002, control] | to_regex }} -> '(compute-\d+)|(control)'
4242
"""
4343

44+
# NB: for python3.12+ the \d in this function & docstring
45+
# need to be raw strings. See https://docs.python.org/3/reference/lexical_analysis.html
46+
4447
# There's a python bug which means re.sub() can't use '\d' in the replacement so
4548
# have to do replacement in two stages:
4649
r = [re.sub(r"\d+", 'XBACKSLASHX', v) for v in items]

dev/setup-env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ PYTHON_VERSION=""
1717
if [[ "$OS" == "ubuntu" && "$MAJOR_VERSION" == "22" ]]; then
1818
PYTHON_VERSION="/usr/bin/python3.10"
1919
elif [[ "$OS" == "rocky" && "$MAJOR_VERSION" == "8" ]]; then
20+
# python3.9+ doesn't have selinux bindings
2021
PYTHON_VERSION="/usr/bin/python3.8" # use `sudo yum install python38` on Rocky Linux 8 to install this
2122
elif [[ "$OS" == "rocky" && "$MAJOR_VERSION" == "9" ]]; then
2223
PYTHON_VERSION="/usr/bin/python3.9"

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ansible==8.0.0
1+
ansible==6.7.0 # cloudalchemy.prometheus uses ansible.builtin.include, removed in ansible-core==2.16 => ansible==9
22
openstacksdk
33
python-openstackclient==6.6.1 # v7.0.0 has a bug re. rebuild
44
python-manilaclient
@@ -9,4 +9,4 @@ cookiecutter
99
selinux # this is a shim to avoid having to use --system-site-packages, you still need sudo yum install libselinux-python3
1010
netaddr
1111
matplotlib
12-
pulp-cli==0.29.2
12+
pulp-cli==0.23.2

requirements.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ collections:
4949
- name: https://github.com/azimuth-cloud/ansible-collection-image-utils
5050
type: git
5151
version: 0.4.0
52+
# stackhpc.pulp has pulp.squeezer as dependency, any version, but latest
53+
# requires newer ansible than can install
54+
- name: pulp.squeezer
55+
version: 0.0.15
5256
- name: stackhpc.pulp
5357
version: 0.5.5
5458
...

0 commit comments

Comments
 (0)