Skip to content

Commit 115f837

Browse files
authored
Merge pull request #444 from stackhpc/upstream/master-2025-06-30
Synchronise master with upstream
2 parents d3d5d59 + 64a845a commit 115f837

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

ansible/roles/dev-tools/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ dev_tools_packages_system:
1515
- acl
1616

1717
# List of packages to install.
18-
dev_tools_packages: "{{ dev_tools_packages_default + dev_tools_packages_extra + dev_tools_packages_system }}"
18+
dev_tools_packages: "{{ (dev_tools_packages_default + dev_tools_packages_extra + dev_tools_packages_system) | select | list }}"

doc/source/configuration/reference/hosts.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ Development tools
518518
| ``dev-tools``
519519
520520
Development tools (additional OS packages) can be configured to be installed
521-
on hosts. By default Ddvelopment tools are installed on all
521+
on hosts. By default development tools are installed on all
522522
``seed-hypervisor``, ``seed``, ``overcloud`` and ``infra-vms`` hosts.
523523

524524
The following variables can be used to set which packages to install:
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
upgrade:
3+
- |
4+
Bumps the ``dellemc.os10`` collection to version 1.2.7. This resolves an
5+
issue with applying some configuration blocks.
6+
`LP#2115121 <https://bugs.launchpad.net/kayobe/+bug/2115121>`__
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes support for empty strings in the ``dev-tools`` package lists. This
5+
allows using expressions such as ``{{ 'foo' if os_distribution == 'rocky'
6+
else '' }}``.
7+
`LP#2115000 <https://bugs.launchpad.net/kayobe/+bug/2115000>`__

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ collections:
66
- name: community.docker
77
version: 3.11.0
88
- name: dellemc.os10
9-
version: 1.1.1
9+
version: 1.2.7
1010
- name: nvidia.nvue
1111
version: 1.2.6
1212
- name: openstack.cloud

0 commit comments

Comments
 (0)