Skip to content

Commit 7e85af5

Browse files
authored
Merge pull request #435 from stackhpc/upstream/2025.1-2025-06-16
Synchronise 2025.1 with upstream
2 parents d99746e + 92219a7 commit 7e85af5

File tree

5 files changed

+26
-9
lines changed

5 files changed

+26
-9
lines changed

ansible/container-image-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
kolla-build
5454
--config-dir {{ kolla_build_config_path }}
5555
--engine {{ container_engine }}
56-
{% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %}
56+
{% if kolla_docker_registry %}--registry {{ kolla_docker_registry }}{% endif %}
5757
{% if push_images | bool %}--push{% endif %}
5858
{% if nocache | bool %}--nocache{% endif %}
5959
{% if kolla_base_arch != ansible_facts.architecture %}--platform {{ platform }}{% endif %}

ansible/kayobe-target-venv.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,21 @@
2121
- not ansible_python_interpreter.startswith('/bin')
2222
- not ansible_python_interpreter.startswith('/usr/bin')
2323

24-
- block:
25-
- name: Gather facts
26-
setup:
27-
filter: "{{ kayobe_ansible_setup_filter }}"
28-
gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
29-
when: not ansible_facts
30-
register: gather_facts
24+
- name: Gather facts
25+
setup:
26+
filter: "{{ kayobe_ansible_setup_filter }}"
27+
gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
28+
when:
29+
- ansible_facts is undefined or not ansible_facts
30+
- kayobe_virtualenv is defined
31+
register: gather_facts
32+
# Before any facts are gathered, ansible doesn't know about
33+
# python virtualenv.
34+
# Use default python3 to be safe for this task.
35+
vars:
36+
ansible_python_interpreter: /usr/bin/python3
3137

38+
- block:
3239
- name: Ensure the Python venv package is installed on Debian family systems
3340
package:
3441
name: python3-venv
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Bumps the ``stackhpc.libvirt-vm`` role to v1.16.3 to fix seed and infra VM
5+
provisioning failures on Rocky Linux 9.6.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue building images with a regex when no image registry is set
5+
`LP#2112646 <https://bugs.launchpad.net/kayobe/+bug/2112646>`__

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ roles:
4343
- src: stackhpc.libvirt-host
4444
version: v1.12.1
4545
- src: stackhpc.libvirt-vm
46-
version: v1.16.2
46+
version: v1.16.3
4747
- src: stackhpc.luks
4848
version: 0.4.2
4949
- src: stackhpc.os-ironic-state

0 commit comments

Comments
 (0)