Skip to content

Commit f3e26cf

Browse files
authored
Merge pull request #495 from stackhpc/upstream/master-2025-11-10
Synchronise master with upstream
2 parents a37f25e + 15353c0 commit f3e26cf

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

ansible/baremetal-compute-introspection-data-save.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
- name: Set up openstack cli virtualenv
99
pip:
1010
virtualenv: "{{ venv }}"
11-
virtualenv_command: python3 -m venv
1211
name:
1312
- python-openstackclient
1413
- python-ironic-inspector-client
1514
state: latest
15+
virtualenv_command: python3.{{ ansible_facts.python.version.minor }} -m venv
1616
extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
1717

1818
- name: Ensure the baremetal compute nodes' hardware introspection data is saved

ansible/baremetal-compute-rename.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
- name: Rename baremetal compute nodes
77
hosts: controllers[0]
8-
gather_facts: False
8+
gather_facts: True
99
vars:
1010
venv: "{{ virtualenv_path }}/openstack-cli"
1111
pre_tasks:
@@ -16,6 +16,7 @@
1616
- python-openstackclient
1717
- python-ironicclient
1818
state: latest
19+
virtualenv_command: "python3.{{ ansible_facts.python.version.minor }} -m venv"
1920
extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
2021

2122
- name: Rename baremetal compute nodes

ansible/baremetal-compute-serial-console.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
- name: Setup OpenStack Environment
77
hosts: controllers[0]
8-
gather_facts: False
8+
gather_facts: True
99
vars:
1010
venv: "{{ virtualenv_path }}/openstack-cli"
1111
pre_tasks:
@@ -16,6 +16,7 @@
1616
- python-openstackclient
1717
- python-ironicclient
1818
state: latest
19+
virtualenv_command: "python3.{{ ansible_facts.python.version.minor }} -m venv"
1920
extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
2021

2122
- block:

playbooks/kayobe-overcloud-host-configure-base/pre.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
vars:
44
testinfra_venv: ~/testinfra-venv
55
tasks:
6-
- name: Ensure python3 is installed
6+
- name: Ensure python3 and setuptools are installed
77
package:
8-
name: python3
8+
name:
9+
- python3
10+
- python3-setuptools
911
become: true
1012

1113
- name: Install Python3.12 on RHEL derivatives
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Call virtualenv as a Python module during baremetal compute serial console
5+
setup to fix ``executable not found`` error on Rocky Linux.

0 commit comments

Comments
 (0)