Skip to content

Synchronise master with upstream#535

Merged
Alex-Welsh merged 17 commits intostackhpc/masterfrom
upstream/master-2026-03-23
Mar 23, 2026
Merged

Synchronise master with upstream#535
Alex-Welsh merged 17 commits intostackhpc/masterfrom
upstream/master-2026-03-23

Conversation

@github-actions
Copy link

This PR contains a snapshot of master from upstream master.

priteau and others added 17 commits March 2, 2026 14:29
Release 6.0.0 of python-ironicclient changed the way node attributes are
named in JSON output [1]. We now need to access attributes using lower
case.

[1] https://review.opendev.org/c/openstack/python-ironicclient/+/973948

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/901100

Change-Id: Iccb99cfd1a723b3680b64781488d15e417642522
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
With the G cycle, this feature is always supported.

Change-Id: I0ccbfd7baa2ae43f06a91f34d8357d91e57317ee
Signed-off-by: Matt Crees <mattc@stackhpc.com>
    [DEPRECATION WARNING]: Conditional result (False) was derived from
    value of type 'int' at
    '/home/ubuntu/kayobe/ansible/roles/network-debian/tasks/main.yml:51:9'.
    Conditionals must have a boolean result. This feature will be
    removed from ansible-core version 2.23.
    Origin: /home/ubuntu/kayobe/ansible/roles/network-debian/tasks/main.yml:51:9

    49   command: "udevadm trigger --verbose --subsystem-match=net --action=add"
    50   changed_when: false
    51   when: network_interfaces | networkd_links | length
               ^ column 9

    Broken conditionals are currently allowed because the
    `ALLOW_BROKEN_CONDITIONALS` configuration option is enabled.

TrivialFix

Change-Id: I3e04902ac1cf129d325d291cafb719fd15a84368
Signed-off-by: Will Szumski <will@stackhpc.com>
Broken conditionals are currently allowed because the
`ALLOW_BROKEN_CONDITIONALS` configuration option is enabled.

    [DEPRECATION WARNING]: Conditional result (True) was derived from
    value of type 'str' at
    '/home/zuul/src/opendev.org/openstack/kayobe-config-dev/etc/kayobe/zz-30-overrides.yml:47:25'.
    Conditionals must have a boolean result. This feature will be removed
    from ansible-core version 2.23.
    Origin: /home/zuul/kayobe-venv/share/kayobe/ansible/roles/firewalld/tasks/enabled.yml:50:9

    48   become: true
    49   loop: "{{ network_interfaces }}"
    50   when: item | net_zone
               ^ column 9

TrivialFix

Change-Id: I88e0f12e838070196d8f3ffa4ec95464ab323632
Signed-off-by: Will Szumski <will@stackhpc.com>
This reverts commit aa230f9.

Reason for revert: Bifrost passlib fix is merged.

Change-Id: I5b179291a335cb32c782cf351554fdd6bd3e144f
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
This prevents us needing the CRB and EPEL repositories to be enabled
on Rocky hosts when building DIB images.

Closes-Bug: #2141684
Closes-Bug: #2142501
Change-Id: Id3e610ad466212d3b8dde7a429ea66cc1562b047
Signed-off-by: Will Szumski <will@stackhpc.com>
Network connectivity check fails for hosts that have
no external network, so this check is now skipped if
``http_proxy`` is defined.

Change-Id: Ib6f815c319a7e92e675382cfe9d4011598e72aba
Signed-off-by: Hollie Hutchinson <hollie@stackhpc.com>
Deprecates the options ``--kolla-tags``, ``--kolla-skip-tags``, and
``kolla-limit``. Regular ``--tags``, ``--skip-tags``, and ``--limit``
will now be passed directly to the Kolla-Ansible invocations. The
``kayobe-generate-config`` tag is added to ``kolla-ansible.yml`` and
``kolla-openstack.yml``. It is always called, to allow for limiting to
OpenStack services with just one tag, e.g. ``kayobe overcloud service
deploy -t nova`. You can still skip this with
``--skip-tags kayobe-generate-config``.

Also adds the ``bifrost`` tag to ``kolla-bifrost.yml``, so that we can
easily limit to bifrost in the seed service deploy.

As there is no clean way to handle some of Ansible's "special" tags
like ``none``, using both regular and kolla tags/limits together is no
longer allowed.

Change-Id: I6f466305d49031da4d048f8fa7d2625b261a6fa0
Signed-off-by: Matt Crees <mattc@stackhpc.com>
Co-Authored-By: Will Szumski <will@stackhpc.com>
Change-Id: I5f20b51346eb58d4a5cbf921b5387beb1056b24e
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Adds support for installing and configuring fail2ban in Kayobe using the
robertdebock.fail2ban Ansible role
https://galaxy.ansible.com/ui/standalone/roles/robertdebock/fail2ban/

Change-Id: Ic484b2c4f6e261a5173ba8f5378258068f468fa2
Signed-off-by: Leonie Chamberlin-Medd <leonie@stackhpc.com>
@github-actions github-actions bot requested a review from a team as a code owner March 23, 2026 06:40
@github-actions github-actions bot added automated Automated action performed by GitHub Actions synchronisation labels Mar 23, 2026
@Alex-Welsh Alex-Welsh closed this Mar 23, 2026
@Alex-Welsh Alex-Welsh reopened this Mar 23, 2026
@Alex-Welsh Alex-Welsh merged commit b0148ec into stackhpc/master Mar 23, 2026
3 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/master-2026-03-23 branch March 23, 2026 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants