Skip to content

Synchronise master with upstream#552

Merged
Alex-Welsh merged 8 commits into
stackhpc/masterfrom
upstream/master-2026-06-08
Jun 8, 2026
Merged

Synchronise master with upstream#552
Alex-Welsh merged 8 commits into
stackhpc/masterfrom
upstream/master-2026-06-08

Conversation

@github-actions

@github-actions github-actions Bot commented Jun 8, 2026

Copy link
Copy Markdown

This PR contains a snapshot of master from upstream master.

popododo0720 and others added 8 commits March 13, 2026 15:53
The hostmonitor calls crmadmin and cibadmin with run_as_root=True,
but the sudoers file only includes crm_mon. Since the container runs
as the masakari user, sudo calls to crmadmin and cibadmin fail with
"password required", causing the hostmonitor to skip all host
monitoring every cycle.

This completely breaks automatic instance evacuation in HCI
(hyper-converged) deployments where all nodes run the full pacemaker
stack instead of pacemaker-remote. In separated deployments, the
crmadmin code path is skipped because pacemaker_remote_status=True,
which is why this bug has gone undetected.

Closes-Bug: #2144074
Change-Id: I22bbaa1f1fd1f3d53de48ec7c0099d028118448b
Signed-off-by: Kim soo <popododo0720@naver.com>
And remove the redundant comment and repo enablement in keystone
container.

Change-Id: I3a64b13fcaef62c73cccc9c478e7392efc8ee554
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This change adds images for Kerbside. Kerbside is a SPICE protocol
native proxy used to expose the new spice-direct console type provided
by Openstack Compute. This allows high fidelity virtual desktop
experiences without requiring transcoding of the console into HTML5
in Horizon, or allowing users direct access to the console ports on
your hypervisors.

Sadly, Red Hat chose to remove SPICE support from qemu in RHEL9, and
Rocky Linux has followed along. You therefore _must_ run the Debian or
Ubuntu container images if you wish to use the ``spice-direct``
console type.

Architecturally Kerbside has two components -- an API service which
turns console access URLs from Nova into URLs to ``.vv`` files, and
a proxy service which actually proxies the SPICE traffic. These are
handled as separate container images here because they're quite
different. One is a WSGI REST API, and the other is a daemon. It is
also likely that deployers would choose to host these on different
machines.

Finally, the proxy service needs to be special cased in load
balancing because it strongly expects to terminate TLS itself. The
haproxy is therefore configured as a layer 4 proxy in this case.

Depends-On: https://review.opendev.org/c/openstack/kolla/+/991249
Change-Id: If60a70745462e1360cfadaab1a5a8d75b7fdeb21
Partial-Bug: #2131793 (spice-direct consoles)
Signed-off-by: Michael Still <mikal@stillhq.com>
This reverts the OPENSTACK_RELEASE bump from kolla commit 352b7fc.
The stable/2026.1 branch is now active, so the late-cycle pin to
'2026.1' is stale and needs to be reverted back to 'master' --
mirroring the same housekeeping pattern as the 2025.1->master
revert (87678d0, 2025-05) and the 2025.2->master revert
(c30e4e5, 2025-12).

I specifically found this because Nova master commit 770580bb bumped
oslo.privsep in requirements.txt from >=2.6.2 to >=3.11.0. With
OPENSTACK_RELEASE = '2026.1', openstack_branch resolves to
stable-2026.1 and openstack-base pulls
requirements-stable-2026.1.tar.gz, which still pins
oslo.privsep===3.10.1. The resulting ResolutionImpossible causes
image builds to fail.

Change-Id: I7d156af2fa9677cd4921f518ac1c6ecf7acde9ce
Signed-off-by: Michael Still <mikal@stillhq.com>
@github-actions github-actions Bot requested a review from a team as a code owner June 8, 2026 08:04
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels Jun 8, 2026
@Alex-Welsh Alex-Welsh closed this Jun 8, 2026
@Alex-Welsh Alex-Welsh reopened this Jun 8, 2026
@Alex-Welsh Alex-Welsh merged commit 7befd9d into stackhpc/master Jun 8, 2026
3 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/master-2026-06-08 branch June 8, 2026 08:26
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.

4 participants