Skip to content

Synchronise master with upstream #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 8 commits into from
May 18, 2026
Merged

Synchronise master with upstream #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3a26cd
Update mission statement in docs index
osfrickler Apr 22, 2026
f931316
Drop ironic-inspector from Zuul file trigger
dougszumski Apr 23, 2026
21cacdd
horizon: rebuild static assets after theme changes
grzegorzkoper May 8, 2026
5c3d61a
Ignore D001 Line too long errors in release notes
priteau May 13, 2026
a7c1840
Update master for stable/2026.1
openstackadmin May 7, 2026
d4b8785
Merge "horizon: rebuild static assets after theme changes"
May 13, 2026
0afe556
Merge "Drop ironic-inspector from Zuul file trigger"
May 13, 2026
129e888
Merge "Update mission statement in docs index"
May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
Welcome to Kolla's documentation!
=================================

Kolla's mission is to provide production-ready containers and deployment tools
for operating OpenStack clouds.
Kolla's mission is to provide tools to create production-ready containers and
to provide deployment tools for operating OpenStack clouds.

Related Projects
================
Expand Down
3 changes: 2 additions & 1 deletion docker/horizon/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ function settings_bundle {
tar -cf- --mtime=1970-01-01 \
/etc/openstack-dashboard/local_settings \
/etc/openstack-dashboard/custom_local_settings \
/etc/openstack-dashboard/local_settings.d 2> /dev/null || true
/etc/openstack-dashboard/local_settings.d \
/etc/openstack-dashboard/themes 2> /dev/null || true
}

function settings_changed {
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
fixes:
- |
Fixed Horizon static asset regeneration for custom theme updates.
Changes under ``/etc/openstack-dashboard/themes`` now invalidate the
startup settings hash, so Horizon reruns ``collectstatic`` and
``compress`` after a restart or recreate.
6 changes: 6 additions & 0 deletions releasenotes/source/2026.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
===========================
2026.1 Series Release Notes
===========================

.. release-notes::
:branch: stable/2026.1
1 change: 1 addition & 0 deletions releasenotes/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Contents
:maxdepth: 2

unreleased
2026.1
2025.2
2025.1
2024.2
Expand Down
9 changes: 9 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ commands =
doc8 -e '.yaml' releasenotes/notes/
sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html

[doc8]
ignore-path = releasenotes/notes/bug-2111620-e40e1dec6fed309f.yaml,
releasenotes/notes/bug-2112140-41a1924c260e531c.yaml,
releasenotes/notes/debian-trixie-23987480043dc662.yaml,
releasenotes/notes/flamingo-prelude-b72f2599ed9d25d5.yaml,
releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml,
releasenotes/notes/image-purpose-1884e00f993e09d0.yaml,
releasenotes/notes/rocky-10-4111fa0160be14ab.yaml

[flake8]
show-source = True
enable-extensions = H203,H106
Expand Down
6 changes: 3 additions & 3 deletions zuul.d/scenarios/ironic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
check:
jobs:
- kolla-ansible-debian-trixie-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
- kolla-ansible-rocky-10-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*
- kolla-ansible-ubuntu-noble-ironic:
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
files: ^docker\/(base|dnsmasq|ironic|iscsid|openstack-base)\/.*