Bug#1109140: unblock: nova/31.0.0-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: nova@packages.debian.org
Control: affects -1 + src:nova
Please unblock package aodh
Please unblock package barbican
Please unblock package blazar
Please unblock package ceilometer
Please unblock package cinder
Please unblock package cyborg
Please unblock package designate
Please unblock package glance
Please unblock package heat
Please unblock package ironic
Please unblock package keystone
Please unblock package magnum
Please unblock package manila
Please unblock package masakari
Please unblock package mistral
Please unblock package neutron
Please unblock package nova
Hi,
[ Reason ]
I discover that when running daemons with the queue manager
option, they create a file under /dev/shm that depends on the
process name, unless it is overritten by a config value. As
OpenStack API all run under uwsgi, the process name is the same
and clashes between services.
I've added a OS_OSLO_MESSAGING_RABBIT__PROCESSNAME environment
var at startup of all daemons, which is equivalent to set:
[oslo_messaging_rabbit]
processname=<something>
this way, this avoids multiple daemons using the same qmanager
file.
As I wanted things to be unified, I have set this env var for
all daemons, even if it doesn't change the current behavior
(ie: it used to use argv[0] which is the same as what I've set,
except for uwsgi API where it was really mandatory).
Also, for Neutron, you'll see 2 backported patches as bugfixes.
You may reply for Neutron specifically separately.
[ Impact ]
It would otherwise be impossible for OpenStack users to run
multiple API servers from different OpenStack project on the
same host, if activating the RabbitMQ queue manager.
[ Tests ]
I manually tested the fix.
[ Risks ]
Not much risk: it's just an env var per daemon.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock aodh/20.0.0-2
unblock barbican/20.0.0-3
unblock blazar/15.0.0-3
unblock ceilometer/24.0.0-2
unblock cinder/26.0.0-2
unblock cyborg/14.0.0-3
unblock designate/20.0.0-2
unblock glance/30.0.0-3
unblock heat/24.0.0-2
unblock ironic/29.0.0-7
unblock keystone/27.0.0-3
unblock magnum/20.0.0-2
unblock manila/20.0.0-3
unblock masakari/19.0.0-3
unblock mistral/20.0.0-2
unblock neutron/26.0.0-8
unblock nova/31.0.0-4
diff --git a/debian/aodh-api-uwsgi.ini b/debian/aodh-api-uwsgi.ini
index 9122d7cd..e451b367 100644
--- a/debian/aodh-api-uwsgi.ini
+++ b/debian/aodh-api-uwsgi.ini
@@ -52,6 +52,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=aodh-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/aodh-evaluator.init.in b/debian/aodh-evaluator.init.in
index 64bf7111..e305a4b9 100644
--- a/debian/aodh-evaluator.init.in
+++ b/debian/aodh-evaluator.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Aodh Evaluator (aodh-evaluator)"
PROJECT_NAME=aodh
NAME=${PROJECT_NAME}-evaluator
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=aodh-evaluator
diff --git a/debian/aodh-expirer.init.in b/debian/aodh-expirer.init.in
index c3ba59c9..4411e66f 100644
--- a/debian/aodh-expirer.init.in
+++ b/debian/aodh-expirer.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Aodh Expirer (aodh-expirer)"
PROJECT_NAME=aodh
NAME=${PROJECT_NAME}-expirer
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=aodh-expirer
diff --git a/debian/aodh-listener.init.in b/debian/aodh-listener.init.in
index daae3361..711e2d42 100644
--- a/debian/aodh-listener.init.in
+++ b/debian/aodh-listener.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Aodh Listener (aodh-listener)"
PROJECT_NAME=aodh
NAME=${PROJECT_NAME}-listener
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=aodh-listener
diff --git a/debian/aodh-notifier.init.in b/debian/aodh-notifier.init.in
index e3e1459e..9658e433 100644
--- a/debian/aodh-notifier.init.in
+++ b/debian/aodh-notifier.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Aodh Notifier (aodh-notifier)"
PROJECT_NAME=aodh
NAME=${PROJECT_NAME}-notifier
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=aodh-notifier
diff --git a/debian/changelog b/debian/changelog
index cee72adc..c23ae708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aodh (20.0.0-2) unstable; urgency=medium
+
+ * Set export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 12:12:52 +0200
+
aodh (20.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/barbican-api-uwsgi.ini b/debian/barbican-api-uwsgi.ini
index 6c145453..e908697c 100644
--- a/debian/barbican-api-uwsgi.ini
+++ b/debian/barbican-api-uwsgi.ini
@@ -53,6 +53,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=barbican-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/barbican-keystone-listener.init.in b/debian/barbican-keystone-listener.init.in
index 5f7956be..2dbfe471 100644
--- a/debian/barbican-keystone-listener.init.in
+++ b/debian/barbican-keystone-listener.init.in
@@ -18,3 +18,4 @@ DESC="OpenStack Barbican Keystone Event Listener (barbican-keystone-listener)"
PROJECT_NAME=barbican
NAME=${PROJECT_NAME}-keystone-listener
NO_OPENSTACK_CONFIG_FILE_DAEMON_ARG=yes
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=barbican-keystone-listener
diff --git a/debian/barbican-worker.init.in b/debian/barbican-worker.init.in
index 7365bd44..bb531958 100644
--- a/debian/barbican-worker.init.in
+++ b/debian/barbican-worker.init.in
@@ -18,3 +18,4 @@ DESC="OpenStack Barbican Workers (barbican-worker)"
PROJECT_NAME=barbican
NAME=${PROJECT_NAME}-worker
NO_OPENSTACK_CONFIG_FILE_DAEMON_ARG=yes
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=barbican-worker
diff --git a/debian/changelog b/debian/changelog
index 12357daf..d2657a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+barbican (1:20.0.0-3) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 10:13:11 +0200
+
barbican (1:20.0.0-2) unstable; urgency=medium
* Add upstream patch Refactor-test_create_pkcs11-for-future-compat.patch and
diff --git a/debian/blazar-api-uwsgi.ini b/debian/blazar-api-uwsgi.ini
index 5833dbd..7cc83ff 100644
--- a/debian/blazar-api-uwsgi.ini
+++ b/debian/blazar-api-uwsgi.ini
@@ -53,6 +53,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=blazar-api
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/blazar/blazar-api.log
diff --git a/debian/blazar-manager.init.in b/debian/blazar-manager.init.in
index 215eb3f..450ee91 100644
--- a/debian/blazar-manager.init.in
+++ b/debian/blazar-manager.init.in
@@ -13,3 +13,4 @@
DESC="OpenStack Blazar Manager (blazar-manager)"
PROJECT_NAME=blazar
NAME=${PROJECT_NAME}-manager
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=blazar-manager
diff --git a/debian/changelog b/debian/changelog
index 145ab51..636d64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+blazar (15.0.0-3) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 12:21:03 +0200
+
blazar (15.0.0-2) unstable; urgency=medium
* Add fix-lease-date-not-enough-in-the-future.patch (Closes: #1104885).
diff --git a/debian/ceilometer-agent-notification.init.in b/debian/ceilometer-agent-notification.init.in
index bae5b9b23..03648e08f 100644
--- a/debian/ceilometer-agent-notification.init.in
+++ b/debian/ceilometer-agent-notification.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Ceilometer Notification Agent (ceilometer-agent-notification)"
PROJECT_NAME=ceilometer
NAME=${PROJECT_NAME}-agent-notification
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=ceilometer-agent-notification
diff --git a/debian/ceilometer-polling.init.in b/debian/ceilometer-polling.init.in
index 3347c1df2..884fe6b21 100644
--- a/debian/ceilometer-polling.init.in
+++ b/debian/ceilometer-polling.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Ceilometer Polling (ceilometer-polling)"
PROJECT_NAME=ceilometer
NAME=${PROJECT_NAME}-polling
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=ceilometer-agent-notification
diff --git a/debian/changelog b/debian/changelog
index b8b0fcea9..32f55321e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (1:24.0.0-2) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 13:41:25 +0200
+
ceilometer (1:24.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 7fb3bd751..e80706a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cinder (2:26.0.0-2) unstable; urgency=medium
+
+ * Set export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME in daemons, so they don't
+ clash with other OpenStack services in /dev/shm.
+
+ -- Thomas Goirand <zigo@debian.org> Thu, 10 Jul 2025 21:45:33 +0200
+
cinder (2:26.0.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/cinder-api-uwsgi.ini b/debian/cinder-api-uwsgi.ini
index 984799fc5..b31772c16 100644
--- a/debian/cinder-api-uwsgi.ini
+++ b/debian/cinder-api-uwsgi.ini
@@ -53,6 +53,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cinder-api
# These are used in the gate.
# The http-auto-chunked / http-chunked-input
diff --git a/debian/cinder-api.init.in b/debian/cinder-api.init.in
index 86b3f8199..ffcd1762d 100644
--- a/debian/cinder-api.init.in
+++ b/debian/cinder-api.init.in
@@ -24,3 +24,5 @@ NAME=${PROJECT_NAME}-api
UWSGI_PORT=8776
UWSGI_INI_PATH=/etc/cinder/cinder-api-uwsgi.ini
UWSGI_INI_APP=/usr/bin/cinder-wsgi
+export OS_OSLO_MESSAGING_RABBIT_PROCESSNAME=cinder-api
+
diff --git a/debian/cinder-backup.init.in b/debian/cinder-backup.init.in
index 05dcb91b0..6bdfc04ff 100644
--- a/debian/cinder-backup.init.in
+++ b/debian/cinder-backup.init.in
@@ -18,3 +18,4 @@ NAME=${PROJECT_NAME}-backup
export MALLOC_ARENA_MAX=1
export MALLOC_MMAP_THRESHOLD_=131072
export MALLOC_TRIM_THRESHOLD_=262144
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cinder-backup
diff --git a/debian/cinder-scheduler.init.in b/debian/cinder-scheduler.init.in
index 6ebb153f2..6e5d03cac 100644
--- a/debian/cinder-scheduler.init.in
+++ b/debian/cinder-scheduler.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Cinder Scheduler (cinder-scheduler)"
PROJECT_NAME=cinder
NAME=${PROJECT_NAME}-scheduler
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cinder-scheduler
diff --git a/debian/cinder-volume.init.in b/debian/cinder-volume.init.in
index c42c69d9f..d8db76c4d 100644
--- a/debian/cinder-volume.init.in
+++ b/debian/cinder-volume.init.in
@@ -19,4 +19,5 @@ NAME=${PROJECT_NAME}-volume
export MALLOC_ARENA_MAX=1
export MALLOC_MMAP_THRESHOLD_=131072
export MALLOC_TRIM_THRESHOLD_=262144
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cinder-volume
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 8dbe956..9a3bbbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cyborg (14.0.0-3) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME in all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 10:23:11 +0200
+
cyborg (14.0.0-2) unstable; urgency=medium
* Blacklist TestFPGADriver.test_program that is failing in Bookworm.
diff --git a/debian/cyborg-agent.init.in b/debian/cyborg-agent.init.in
index 50fc394..10e182a 100644
--- a/debian/cyborg-agent.init.in
+++ b/debian/cyborg-agent.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Cyborg agent"
PROJECT_NAME=cyborg
NAME=${PROJECT_NAME}-agent
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cyborg-agent
\ No newline at end of file
diff --git a/debian/cyborg-api-uwsgi.ini b/debian/cyborg-api-uwsgi.ini
index 60f7958..a25bba3 100644
--- a/debian/cyborg-api-uwsgi.ini
+++ b/debian/cyborg-api-uwsgi.ini
@@ -53,6 +53,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cyborg-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/cyborg-conductor.init.in b/debian/cyborg-conductor.init.in
index 553561f..4efa41a 100644
--- a/debian/cyborg-conductor.init.in
+++ b/debian/cyborg-conductor.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Cyborg conductor"
PROJECT_NAME=cyborg
NAME=${PROJECT_NAME}-conductor
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=cyborg-conductor
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 87c2623e..7b7ad8dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+designate (1:20.0.0-2) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 05 Apr 2025 14:01:54 +0200
+
designate (1:20.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/designate-agent.init.in b/debian/designate-agent.init.in
index 71ce0357..f9543522 100644
--- a/debian/designate-agent.init.in
+++ b/debian/designate-agent.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS Agent (designate-agent)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-agent
+export OS_OSLO_MESSAGING_RABBIT_PROCESSNAME=designate-agent
diff --git a/debian/designate-api-uwsgi.ini b/debian/designate-api-uwsgi.ini
index edaaa753..0a94e96e 100644
--- a/debian/designate-api-uwsgi.ini
+++ b/debian/designate-api-uwsgi.ini
@@ -56,6 +56,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/designate-api.init.in b/debian/designate-api.init.in
index 028e5ae9..7b1f8e3a 100644
--- a/debian/designate-api.init.in
+++ b/debian/designate-api.init.in
@@ -19,3 +19,5 @@ NAME=${PROJECT_NAME}-api
UWSGI_PORT=9001
UWSGI_INI_PATH=/etc/designate/designate-api-uwsgi.ini
UWSGI_INI_APP=/usr/bin/designate-api-wsgi
+export OS_OSLO_MESSAGING_RABBIT_PROCESSNAME=designate-api
+
diff --git a/debian/designate-central.init.in b/debian/designate-central.init.in
index 7de30340..b5be22b2 100644
--- a/debian/designate-central.init.in
+++ b/debian/designate-central.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS central (designate-central)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-central
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-central
diff --git a/debian/designate-mdns.init.in b/debian/designate-mdns.init.in
index e2ea23b6..52592101 100644
--- a/debian/designate-mdns.init.in
+++ b/debian/designate-mdns.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS minidns (designate-mdns)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-mdns
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-mdns
diff --git a/debian/designate-pool-manager.init.in b/debian/designate-pool-manager.init.in
index ed7cff0b..e9c21979 100644
--- a/debian/designate-pool-manager.init.in
+++ b/debian/designate-pool-manager.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS pool manager (designate-pool-manager)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-pool-manager
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-pool-manager
diff --git a/debian/designate-producer.init.in b/debian/designate-producer.init.in
index f68d1567..248191a9 100644
--- a/debian/designate-producer.init.in
+++ b/debian/designate-producer.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS producer (designate-producer)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-producer
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-producer
diff --git a/debian/designate-sink.init.in b/debian/designate-sink.init.in
index 4af139ab..b84ddadf 100644
--- a/debian/designate-sink.init.in
+++ b/debian/designate-sink.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS Sink (designate-sink)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-sink
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-sink
diff --git a/debian/designate-worker.init.in b/debian/designate-worker.init.in
index f27f5b46..46c55f61 100644
--- a/debian/designate-worker.init.in
+++ b/debian/designate-worker.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS worker (designate-worker)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-worker
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-worker
diff --git a/debian/designate-zone-manager.init.in b/debian/designate-zone-manager.init.in
index 49d7faab..c3733bf1 100644
--- a/debian/designate-zone-manager.init.in
+++ b/debian/designate-zone-manager.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Designate DNSaaS zone manager (designate-zone-manager)"
PROJECT_NAME=designate
NAME=${PROJECT_NAME}-zone-manager
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=designate-zone-manager
diff --git a/debian/changelog b/debian/changelog
index b1de28fdb..734f64393 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+glance (2:30.0.0-3) unstable; urgency=medium
+
+ * Fix uwsgi config.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 10:29:31 +0200
+
+glance (2:30.0.0-2) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 13:51:40 +0200
+
glance (2:30.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/glance-api-uwsgi.ini b/debian/glance-api-uwsgi.ini
index da418e507..c7513a25e 100644
--- a/debian/glance-api-uwsgi.ini
+++ b/debian/glance-api-uwsgi.ini
@@ -53,6 +53,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=glance-api
# These are used in the gate.
# The http-auto-chunked / http-chunked-input
diff --git a/debian/glance-api.init.in b/debian/glance-api.init.in
index e9c48088e..89f6614c9 100644
--- a/debian/glance-api.init.in
+++ b/debian/glance-api.init.in
@@ -19,3 +19,4 @@ CONFIG_FILE=/etc/${PROJECT_NAME}/glance-api.conf
#UWSGI_PORT=9292
#UWSGI_INI_PATH=/etc/glance/glance-api-uwsgi.ini
#UWSGI_INI_APP=/usr/bin/glance-wsgi-api
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=glance-api
diff --git a/debian/changelog b/debian/changelog
index fb64a53a2..4a57f37b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+heat (1:24.0.0-2) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 13:53:44 +0200
+
heat (1:24.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/heat-api-cfn-uwsgi.ini b/debian/heat-api-cfn-uwsgi.ini
index f2f65c11d..9b64dfbcf 100644
--- a/debian/heat-api-cfn-uwsgi.ini
+++ b/debian/heat-api-cfn-uwsgi.ini
@@ -49,6 +49,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=heat-api-cfn
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/heat/heat-api.log
diff --git a/debian/heat-api-uwsgi.ini b/debian/heat-api-uwsgi.ini
index d63a206bd..8d242d908 100644
--- a/debian/heat-api-uwsgi.ini
+++ b/debian/heat-api-uwsgi.ini
@@ -53,6 +53,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=heat-api
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/heat/heat-api.log
diff --git a/debian/heat-engine.init.in b/debian/heat-engine.init.in
index 966c79c32..0ce7eaeac 100644
--- a/debian/heat-engine.init.in
+++ b/debian/heat-engine.init.in
@@ -13,3 +13,4 @@
DESC="OpenStack Heat Engine (heat-engine)"
PROJECT_NAME=heat
NAME=${PROJECT_NAME}-engine
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=heat-engine
diff --git a/debian/changelog b/debian/changelog
index 4900c3ea7..ad9a79c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ironic (1:29.0.0-7) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 13:58:33 +0200
+
ironic (1:29.0.0-6) unstable; urgency=high
* CVE-2025-44021: Ironic fails to restrict paths used for file:// image URLs.
diff --git a/debian/ironic-api-uwsgi.ini b/debian/ironic-api-uwsgi.ini
index 2e2d12f37..47da86321 100644
--- a/debian/ironic-api-uwsgi.ini
+++ b/debian/ironic-api-uwsgi.ini
@@ -53,6 +53,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=ironic-api
# These are used in the gate.
# The http-auto-chunked / http-chunked-input
diff --git a/debian/ironic-conductor.init.in b/debian/ironic-conductor.init.in
index 11b85a3cb..03bfb8126 100644
--- a/debian/ironic-conductor.init.in
+++ b/debian/ironic-conductor.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Ironic Conductor (ironic-conductor)"
PROJECT_NAME=ironic
NAME=${PROJECT_NAME}-conductor
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=ironic-conductor
diff --git a/debian/ironic-novncproxy.init.in b/debian/ironic-novncproxy.init.in
index f786239ce..8a54be25b 100644
--- a/debian/ironic-novncproxy.init.in
+++ b/debian/ironic-novncproxy.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Ironic NoVNC proxy (ironic-novncproxy)"
PROJECT_NAME=ironic
NAME=${PROJECT_NAME}-novncproxy
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=ironic-novncproxy
diff --git a/debian/changelog b/debian/changelog
index 0c79d0c2d..f1febf8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keystone (2:27.0.0-3) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:00:40 +0200
+
keystone (2:27.0.0-2) unstable; urgency=medium
* Added api_Remove_constraints_on_user_IDs.patch. Without it, users with an
diff --git a/debian/keystone-uwsgi.ini b/debian/keystone-uwsgi.ini
index 43655f471..625a4e60e 100644
--- a/debian/keystone-uwsgi.ini
+++ b/debian/keystone-uwsgi.ini
@@ -58,6 +58,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=keystone
+
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/keystone/keystone.log
name = keystone-api
diff --git a/debian/changelog b/debian/changelog
index f9f5aad6..21148584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+magnum (20.0.0-2) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:04:18 +0200
+
magnum (20.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/magnum-api-uwsgi.ini b/debian/magnum-api-uwsgi.ini
index e53693d1..13360a7d 100644
--- a/debian/magnum-api-uwsgi.ini
+++ b/debian/magnum-api-uwsgi.ini
@@ -53,6 +53,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=magnum-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/magnum-conductor.init.in b/debian/magnum-conductor.init.in
index cfc26064..12730416 100644
--- a/debian/magnum-conductor.init.in
+++ b/debian/magnum-conductor.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Magnum Conductor (magnum-conductor)"
PROJECT_NAME=magnum
NAME=${PROJECT_NAME}-conductor
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=magnum-conductor
diff --git a/debian/changelog b/debian/changelog
index 44298ef9e..7c7445dbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+manila (1:20.0.0-3) unstable; urgency=medium
+
+ * Fix uwsgi config.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 10:45:46 +0200
+
+manila (1:20.0.0-2) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:11:15 +0200
+
manila (1:20.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/manila-api-uwsgi.ini b/debian/manila-api-uwsgi.ini
index 8e8ac6b0d..a7258eb8f 100644
--- a/debian/manila-api-uwsgi.ini
+++ b/debian/manila-api-uwsgi.ini
@@ -53,6 +53,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=manila-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/manila-data.init.in b/debian/manila-data.init.in
index f4bdbec66..cf629159e 100644
--- a/debian/manila-data.init.in
+++ b/debian/manila-data.init.in
@@ -16,3 +16,4 @@
DESC="OpenStack Manila Data Service (manila-data)"
PROJECT_NAME=manila
NAME=${PROJECT_NAME}-data
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=manila-data
diff --git a/debian/manila-scheduler.init.in b/debian/manila-scheduler.init.in
index 0f5f01f6f..73905b5c1 100644
--- a/debian/manila-scheduler.init.in
+++ b/debian/manila-scheduler.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Manila Scheduler (manila-scheduler)"
PROJECT_NAME=manila
NAME=${PROJECT_NAME}-scheduler
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=manila-scheduler
diff --git a/debian/manila-share.init.in b/debian/manila-share.init.in
index 772d1555f..0e7bb2065 100644
--- a/debian/manila-share.init.in
+++ b/debian/manila-share.init.in
@@ -15,3 +15,4 @@
DESC="OpenStack Manila Share (manila-share)"
PROJECT_NAME=manila
NAME=${PROJECT_NAME}-share
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=manila-share
diff --git a/debian/changelog b/debian/changelog
index 76f0e44..066ff48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+masakari (19.0.0-3) unstable; urgency=medium
+
+ * Fix uwsgi config.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 10:56:25 +0200
+
+masakari (19.0.0-2) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:12:22 +0200
+
masakari (19.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/masakari-api-uwsgi.ini b/debian/masakari-api-uwsgi.ini
index 52b560f..7e94716 100644
--- a/debian/masakari-api-uwsgi.ini
+++ b/debian/masakari-api-uwsgi.ini
@@ -53,6 +53,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=masakari-api
+
# This is needed, otherwise connections stay open
#add-header = Connection: close
diff --git a/debian/masakari-engine.init.in b/debian/masakari-engine.init.in
index fea2efc..8df1d56 100644
--- a/debian/masakari-engine.init.in
+++ b/debian/masakari-engine.init.in
@@ -19,3 +19,4 @@
DESC="OpenStack Masakari Engine (masakari-engine)"
PROJECT_NAME=masakari
NAME=${PROJECT_NAME}-engine
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=masakari-engine
diff --git a/debian/changelog b/debian/changelog
index 9b71bb50..5e81995d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mistral (20.0.0-2) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME to all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 11:27:02 +0200
+
mistral (20.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/mistral-api-uwsgi.ini b/debian/mistral-api-uwsgi.ini
index 8f5a363b..fcc31e36 100644
--- a/debian/mistral-api-uwsgi.ini
+++ b/debian/mistral-api-uwsgi.ini
@@ -52,6 +52,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=mistral-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/mistral-engine.init.in b/debian/mistral-engine.init.in
index c47693d7..47db8215 100644
--- a/debian/mistral-engine.init.in
+++ b/debian/mistral-engine.init.in
@@ -18,3 +18,4 @@ PROJECT_NAME=mistral
NAME=${PROJECT_NAME}-engine
DAEMON=/usr/bin/mistral-server
DAEMON_ARGS="--server engine"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=mistral-engine
diff --git a/debian/mistral-event-engine.init.in b/debian/mistral-event-engine.init.in
index ddd4687e..af3477d5 100644
--- a/debian/mistral-event-engine.init.in
+++ b/debian/mistral-event-engine.init.in
@@ -18,3 +18,5 @@ PROJECT_NAME=mistral
NAME=${PROJECT_NAME}-event-engine
DAEMON=/usr/bin/mistral-server
DAEMON_ARGS="--server event-engine"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=mistral-event-engine
+
diff --git a/debian/mistral-executor.init.in b/debian/mistral-executor.init.in
index 41edffb7..efa07efc 100644
--- a/debian/mistral-executor.init.in
+++ b/debian/mistral-executor.init.in
@@ -18,3 +18,4 @@ PROJECT_NAME=mistral
NAME=${PROJECT_NAME}-executor
DAEMON=/usr/bin/mistral-server
DAEMON_ARGS="--server executor"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=mistral-executor
diff --git a/debian/changelog b/debian/changelog
index 74d3dae725..998f7f71dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+neutron (2:26.0.0-8) unstable; urgency=medium
+
+ * Add export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:19:05 +0200
+
+neutron (2:26.0.0-7) unstable; urgency=medium
+
+ * Add patches:
+ - Add_state_reporting_back_to_metadata_agents.patch
+ - Fix_LoopingCallBase_argument_issue.patch
+
+ -- Thomas Goirand <zigo@debian.org> Tue, 08 Jul 2025 17:54:19 +0200
+
neutron (2:26.0.0-6) unstable; urgency=medium
* Fix KillMode and not killmode in neutron-l3-agent.service.
diff --git a/debian/neutron-api-uwsgi.ini b/debian/neutron-api-uwsgi.ini
index 6a220bf8e2..3524ec0d32 100644
--- a/debian/neutron-api-uwsgi.ini
+++ b/debian/neutron-api-uwsgi.ini
@@ -57,6 +57,8 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-api
+
# This is needed, otherwise connections stay open
add-header = Connection: close
diff --git a/debian/neutron-dhcp-agent.init.in b/debian/neutron-dhcp-agent.init.in
index 89aa60fe97..5cc155aec2 100644
--- a/debian/neutron-dhcp-agent.init.in
+++ b/debian/neutron-dhcp-agent.init.in
@@ -20,3 +20,4 @@ NAME=${PROJECT_NAME}-dhcp-agent
# --config-file=/etc/neutron/neutron.conf will be happened
# to DAEMON_ARGS later by openstack-pkg-tools
DAEMON_ARGS="--config-file=/etc/neutron/dhcp_agent.ini"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-dhcp-agent
diff --git a/debian/neutron-l3-agent.init.in b/debian/neutron-l3-agent.init.in
index bbf958b216..7453cbffa2 100644
--- a/debian/neutron-l3-agent.init.in
+++ b/debian/neutron-l3-agent.init.in
@@ -25,3 +25,4 @@ CUSTOM_SYSTEMD_SERVICE_DIRECTIVES="KillMode=process"
if [ -e /etc/neutron/agent.conf.d ] ; then
DAEMON_ARGS="--config-dir=/etc/neutron/agent.conf.d ${DAEMON_ARGS}"
fi
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-l3-agent
diff --git a/debian/neutron-linuxbridge-agent.init.in b/debian/neutron-linuxbridge-agent.init.in
index e0968f6b34..0aba7aae95 100644
--- a/debian/neutron-linuxbridge-agent.init.in
+++ b/debian/neutron-linuxbridge-agent.init.in
@@ -23,4 +23,4 @@ NAME=${PROJECT_NAME}-linuxbridge-agent
# to use this agent
DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --config-file=/etc/neutron/plugins/ml2/linuxbridge_agent.ini"
-
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-linuxbridge-agent
diff --git a/debian/neutron-macvtap-agent.init.in b/debian/neutron-macvtap-agent.init.in
index c9208783eb..d05f08e87f 100644
--- a/debian/neutron-macvtap-agent.init.in
+++ b/debian/neutron-macvtap-agent.init.in
@@ -18,3 +18,4 @@ NAME=${PROJECT_NAME}-macvtap-agent
# --config-file=/etc/neutron/neutron.conf will be happened
# to DAEMON_ARGS later by openstack-pkg-tools
DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/macvtap_agent.ini"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-macvtap-agent
diff --git a/debian/neutron-metadata-agent.init.in b/debian/neutron-metadata-agent.init.in
index fb9042999b..d41af6b40d 100644
--- a/debian/neutron-metadata-agent.init.in
+++ b/debian/neutron-metadata-agent.init.in
@@ -18,3 +18,4 @@ NAME=${PROJECT_NAME}-metadata-agent
# --config-file=/etc/neutron/neutron.conf will be happened
# to DAEMON_ARGS later by openstack-pkg-tools
DAEMON_ARGS="--config-file=/etc/neutron/metadata_agent.ini"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-metadata-agent
diff --git a/debian/neutron-metering-agent.init.in b/debian/neutron-metering-agent.init.in
index 72aaa54ff3..e99db78f6e 100644
--- a/debian/neutron-metering-agent.init.in
+++ b/debian/neutron-metering-agent.init.in
@@ -18,3 +18,4 @@ NAME=${PROJECT_NAME}-metering-agent
# --config-file=/etc/neutron/neutron.conf will be happened
# to DAEMON_ARGS later by openstack-pkg-tools
DAEMON_ARGS="--config-file=/etc/neutron/metering_agent.ini"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-metering-agent
diff --git a/debian/neutron-openvswitch-agent.init.in b/debian/neutron-openvswitch-agent.init.in
index e54e253856..70c5fbc16c 100644
--- a/debian/neutron-openvswitch-agent.init.in
+++ b/debian/neutron-openvswitch-agent.init.in
@@ -30,3 +30,4 @@ fi
# Workaround to have "iptables-save -t raw" to work after reboot.
iptables -t raw -L >/dev/null 2>&1 || true
ip6tables -t raw -L >/dev/null 2>&1 || true
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-openvswitch-agent
diff --git a/debian/neutron-ovn-agent.init.in b/debian/neutron-ovn-agent.init.in
index caf6c4432d..1c627dd53b 100644
--- a/debian/neutron-ovn-agent.init.in
+++ b/debian/neutron-ovn-agent.init.in
@@ -30,3 +30,4 @@ fi
# Workaround to have "iptables-save -t raw" to work after reboot.
iptables -t raw -L >/dev/null 2>&1 || true
ip6tables -t raw -L >/dev/null 2>&1 || true
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-ovn-agent
diff --git a/debian/neutron-ovn-maintenance-worker.init.in b/debian/neutron-ovn-maintenance-worker.init.in
index 538386b79a..8f25184304 100644
--- a/debian/neutron-ovn-maintenance-worker.init.in
+++ b/debian/neutron-ovn-maintenance-worker.init.in
@@ -47,3 +47,4 @@ if [ -e /etc/neutron/server.conf.d ] ; then
fi
### end of plugin selection ###
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-ovn-maintenance-worker
diff --git a/debian/neutron-ovn-metadata-agent.init.in b/debian/neutron-ovn-metadata-agent.init.in
index a98a2b5854..5c0e5e2a90 100644
--- a/debian/neutron-ovn-metadata-agent.init.in
+++ b/debian/neutron-ovn-metadata-agent.init.in
@@ -26,3 +26,4 @@ DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf"
# the actual proxy between VM and Nova will not run as root
SYSTEM_USER=root
SYSTEM_GROUP=root
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-ovn-metadata-agent
diff --git a/debian/neutron-periodic-workers.init.in b/debian/neutron-periodic-workers.init.in
index d9573cbccf..f613deb431 100644
--- a/debian/neutron-periodic-workers.init.in
+++ b/debian/neutron-periodic-workers.init.in
@@ -47,3 +47,4 @@ if [ -e /etc/neutron/server.conf.d ] ; then
fi
### end of plugin selection ###
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-periodic-workers
diff --git a/debian/neutron-rpc-server.init.in b/debian/neutron-rpc-server.init.in
index 64347c2416..249b93b6ef 100644
--- a/debian/neutron-rpc-server.init.in
+++ b/debian/neutron-rpc-server.init.in
@@ -47,3 +47,4 @@ if [ -e /etc/neutron/server.conf.d ] ; then
fi
### end of plugin selection ###
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-rpc-server
diff --git a/debian/neutron-services-server.init.in b/debian/neutron-services-server.init.in
index ab676a4467..35d1134055 100644
--- a/debian/neutron-services-server.init.in
+++ b/debian/neutron-services-server.init.in
@@ -46,3 +46,4 @@ if [ -e /etc/neutron/server.conf.d ] ; then
fi
### end of plugin selection ###
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-services-server
diff --git a/debian/neutron-sriov-agent.init.in b/debian/neutron-sriov-agent.init.in
index 4f5bde20a1..fc29e0ca2a 100644
--- a/debian/neutron-sriov-agent.init.in
+++ b/debian/neutron-sriov-agent.init.in
@@ -19,3 +19,4 @@ DAEMON=/usr/bin/neutron-sriov-nic-agent
# --config-file=/etc/neutron/neutron.conf will be happened
# to DAEMON_ARGS later by openstack-pkg-tools
DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/sriov_agent.ini"
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=neutron-sriov-agent
diff --git a/debian/patches/Add_state_reporting_back_to_metadata_agents.patch b/debian/patches/Add_state_reporting_back_to_metadata_agents.patch
new file mode 100644
index 0000000000..aee7d84470
--- /dev/null
+++ b/debian/patches/Add_state_reporting_back_to_metadata_agents.patch
@@ -0,0 +1,139 @@
+Author: Brian Haley <haleyb.dev@gmail.com>
+Date: Wed, 11 Jun 2025 15:43:19 -0400
+Description: Add state reporting back to metadata agents
+ The call to initialize state reporting was removed
+ in [0], which resulted in the metadata-agent for
+ ML2/OVS being reported as Not Alive (XXX) when
+ 'openstack network agent list' is run, even though
+ it is running properly.
+ .
+ The second part of this fix is that we need force the
+ metadata agents to run using the oslo.service threading
+ backend, not the eventlet one. Otherwise the background
+ thread sending RPC updates to neutron-server will never
+ start.
+ .
+ This also needs to be backported to stable/2025.1 as the
+ original change was merged there, but since oslo.service
+ 4.2.0 does not support the threading backend, we will
+ need to implement private versions of LoopingCallBase
+ and FixedIntervalLoopingCall there.
+ .
+ [0] https://review.opendev.org/c/openstack/neutron/+/942916
+ .
+Bug: https://launchpad.net/bugs/2112492
+Change-Id: I4399b6aca1984003e0b564552cc1907425241b9d
+Origin: upstream, https://review.opendev.org/c/openstack/neutron/+/952399
+Last-Update: 2025-07-01
+
+Index: neutron/neutron/agent/metadata/agent.py
+===================================================================
+--- neutron.orig/neutron/agent/metadata/agent.py
++++ neutron/neutron/agent/metadata/agent.py
+@@ -335,4 +335,5 @@ class UnixDomainMetadataProxy(proxy_base
+ self._server = socketserver.ThreadingUnixStreamServer(
+ file_socket, MetadataProxyHandler)
+ MetadataProxyHandler._conf = self.conf
++ self._init_state_reporting()
+ self._server.serve_forever()
+Index: neutron/neutron/cmd/agents/metadata.py
+===================================================================
+--- neutron.orig/neutron/cmd/agents/metadata.py
++++ neutron/neutron/cmd/agents/metadata.py
+@@ -10,10 +10,15 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import setproctitle
++# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
++import oslo_service.backend as service
++service.init_backend(service.BackendType.THREADING)
+
+-from neutron.agent import metadata_agent
+-from neutron_lib import constants
++# pylint: disable=wrong-import-position
++import setproctitle # noqa: E402
++
++from neutron.agent import metadata_agent # noqa: E402
++from neutron_lib import constants # noqa: E402
+
+
+ def main():
+Index: neutron/neutron/cmd/agents/ovn_metadata.py
+===================================================================
+--- neutron.orig/neutron/cmd/agents/ovn_metadata.py
++++ neutron/neutron/cmd/agents/ovn_metadata.py
+@@ -10,10 +10,15 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import setproctitle
++# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
++import oslo_service.backend as service
++service.init_backend(service.BackendType.THREADING)
+
+-from neutron.agent.ovn import metadata_agent
+-from neutron_lib import constants
++# pylint: disable=wrong-import-position
++import setproctitle # noqa: E402
++
++from neutron.agent.ovn import metadata_agent # noqa: E402
++from neutron_lib import constants # noqa: E402
+
+
+ def main():
+Index: neutron/neutron/cmd/agents/ovn_neutron_agent.py
+===================================================================
+--- neutron.orig/neutron/cmd/agents/ovn_neutron_agent.py
++++ neutron/neutron/cmd/agents/ovn_neutron_agent.py
+@@ -10,9 +10,14 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import setproctitle
++# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
++import oslo_service.backend as service
++service.init_backend(service.BackendType.THREADING)
+
+-from neutron.agent.ovn import ovn_neutron_agent
++# pylint: disable=wrong-import-position
++import setproctitle # noqa: E402
++
++from neutron.agent.ovn import ovn_neutron_agent # noqa: E402
+
+
+ # TODO(ralonsoh): move to ``neutron_lib.constants``.
+Index: neutron/neutron/tests/unit/agent/metadata/test_agent.py
+===================================================================
+--- neutron.orig/neutron/tests/unit/agent/metadata/test_agent.py
++++ neutron/neutron/tests/unit/agent/metadata/test_agent.py
+@@ -12,6 +12,7 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
++import socketserver
+ from unittest import mock
+
+ import ddt
+@@ -435,6 +436,21 @@ class TestUnixDomainMetadataProxy(base.B
+ agent.UnixDomainMetadataProxy(mock.Mock())
+ unlink.assert_called_once_with('/the/path')
+
++ @mock.patch.object(agent, 'MetadataProxyHandler')
++ @mock.patch.object(socketserver, 'ThreadingUnixStreamServer')
++ @mock.patch.object(fileutils, 'ensure_tree')
++ def test_run(self, ensure_dir, server, handler):
++ p = agent.UnixDomainMetadataProxy(self.cfg.CONF)
++ p.run()
++
++ ensure_dir.assert_called_once_with('/the', mode=0o755)
++ server.assert_has_calls([
++ mock.call('/the/path', mock.ANY),
++ mock.call().serve_forever()])
++ self.looping_mock.assert_called_once_with(p._report_state)
++ self.looping_mock.return_value.start.assert_called_once_with(
++ interval=mock.ANY)
++
+ def test_main(self):
+ with mock.patch.object(agent, 'UnixDomainMetadataProxy') as proxy:
+ with mock.patch.object(metadata_agent, 'config') as config:
diff --git a/debian/patches/Fix_LoopingCallBase_argument_issue.patch b/debian/patches/Fix_LoopingCallBase_argument_issue.patch
new file mode 100644
index 0000000000..833f99b0fd
--- /dev/null
+++ b/debian/patches/Fix_LoopingCallBase_argument_issue.patch
@@ -0,0 +1,40 @@
+Author: Brian Haley <haleyb.dev@gmail.com>
+Date: Sun, 22 Jun 2025 16:23:25 -0400
+Description: Fix LoopingCallBase argument issue
+ I changed the argument order for LoopingCallBase based
+ on a pep8 failure, but it led to the code not working.
+ Changed caller to correctly specify the argument using
+ the 'f' keyword to fix the issue.
+ .
+Bug: https://launchpad.net/bugs/2112492
+Change-Id: Iceac2354a669939435c1ed0d32294abc56462f98
+Signed-off-by: Brian Haley <haleyb.dev@gmail.com>
+Origin: upstream, https://review.opendev.org/c/openstack/neutron/+/953064
+Last-Update: 2025-07-01
+
+Index: neutron/neutron/agent/metadata/agent.py
+===================================================================
+--- neutron.orig/neutron/agent/metadata/agent.py
++++ neutron/neutron/agent/metadata/agent.py
+@@ -306,7 +306,7 @@ class UnixDomainMetadataProxy(proxy_base
+ report_interval = cfg.CONF.AGENT.report_interval
+ if report_interval:
+ self.heartbeat = loopingcall.FixedIntervalLoopingCall(
+- self._report_state)
++ f=self._report_state)
+ self.heartbeat.start(interval=report_interval)
+
+ def _report_state(self):
+Index: neutron/neutron/tests/unit/agent/metadata/test_agent.py
+===================================================================
+--- neutron.orig/neutron/tests/unit/agent/metadata/test_agent.py
++++ neutron/neutron/tests/unit/agent/metadata/test_agent.py
+@@ -447,7 +447,7 @@ class TestUnixDomainMetadataProxy(base.B
+ server.assert_has_calls([
+ mock.call('/the/path', mock.ANY),
+ mock.call().serve_forever()])
+- self.looping_mock.assert_called_once_with(p._report_state)
++ self.looping_mock.assert_called_once_with(f=p._report_state)
+ self.looping_mock.return_value.start.assert_called_once_with(
+ interval=mock.ANY)
+
diff --git a/debian/patches/series b/debian/patches/series
index 5d05905aa6..cab59ca62c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
fix-path-of-healthcheck_disable.patch
+Add_state_reporting_back_to_metadata_agents.patch
+Fix_LoopingCallBase_argument_issue.patch
diff --git a/debian/changelog b/debian/changelog
index b62b1f8bfd..b8b4a74941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+nova (2:31.0.0-6) unstable; urgency=medium
+
+ * Also do it for nova-api-metadata.
+
+ -- Thomas Goirand <zigo@debian.org> Sat, 12 Jul 2025 11:35:02 +0200
+
+nova (2:31.0.0-5) unstable; urgency=medium
+
+ * export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME for all daemons.
+
+ -- Thomas Goirand <zigo@debian.org> Fri, 11 Jul 2025 14:24:22 +0200
+
nova (2:31.0.0-4) unstable; urgency=medium
* Add Fix-neutron-client-dict-grabbing.patch as a workaround for a nasty
diff --git a/debian/nova-api-metadata-uwsgi.ini b/debian/nova-api-metadata-uwsgi.ini
index 77ebb80557..43535eea73 100644
--- a/debian/nova-api-metadata-uwsgi.ini
+++ b/debian/nova-api-metadata-uwsgi.ini
@@ -54,6 +54,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-api-metadata
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/nova/nova-api-metadata.log
diff --git a/debian/nova-api-uwsgi.ini b/debian/nova-api-uwsgi.ini
index e183252b02..509bce9adb 100644
--- a/debian/nova-api-uwsgi.ini
+++ b/debian/nova-api-uwsgi.ini
@@ -52,6 +52,7 @@ listen = 100
##################################
### OpenStack service specific ###
##################################
+env = OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-api
# This is the standard port for the WSGI application, listening on all available IPs
logto = /var/log/nova/nova-api.log
diff --git a/debian/nova-compute.init.in b/debian/nova-compute.init.in
index 8da64ba788..000166bfbb 100644
--- a/debian/nova-compute.init.in
+++ b/debian/nova-compute.init.in
@@ -25,4 +25,4 @@ if [ -f '/etc/nova/nova-compute.conf' ] ; then
fi
SYSTEMD_TYPE=notify
SYSTEMD_NOTIFY_ACCESS=all
-
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-compute
diff --git a/debian/nova-conductor.init.in b/debian/nova-conductor.init.in
index b314373cd9..8dd512412b 100644
--- a/debian/nova-conductor.init.in
+++ b/debian/nova-conductor.init.in
@@ -20,3 +20,4 @@ NAME=${PROJECT_NAME}-conductor
SYSTEMD_DOC="man:${NAME}(1)"
SYSTEMD_TYPE=notify
SYSTEMD_NOTIFY_ACCESS=all
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-conductor
diff --git a/debian/nova-consoleproxy.nova-novncproxy.init.in b/debian/nova-consoleproxy.nova-novncproxy.init.in
index 3971a97e31..19d7600490 100644
--- a/debian/nova-consoleproxy.nova-novncproxy.init.in
+++ b/debian/nova-consoleproxy.nova-novncproxy.init.in
@@ -32,3 +32,4 @@ if ! [ "${NOVA_CONSOLE_PROXY_TYPE}" = "novnc" ] ; then
exit 0
fi
fi
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-novncproxy
diff --git a/debian/nova-consoleproxy.nova-serialproxy.init.in b/debian/nova-consoleproxy.nova-serialproxy.init.in
index 062af52686..2e5209ff96 100644
--- a/debian/nova-consoleproxy.nova-serialproxy.init.in
+++ b/debian/nova-consoleproxy.nova-serialproxy.init.in
@@ -31,3 +31,4 @@ if ! [ ""$(echo "${NOVA_SERIAL_PROXY_START}" | tr '[:upper:]' '[:lower:]') = "tr
exit 0
fi
fi
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-serialproxy
diff --git a/debian/nova-consoleproxy.nova-spicehtml5proxy.init.in b/debian/nova-consoleproxy.nova-spicehtml5proxy.init.in
index 825bfc3688..20bc81539d 100644
--- a/debian/nova-consoleproxy.nova-spicehtml5proxy.init.in
+++ b/debian/nova-consoleproxy.nova-spicehtml5proxy.init.in
@@ -33,3 +33,4 @@ if ! [ "${NOVA_CONSOLE_PROXY_TYPE}" = "spicehtml5" ] && [ -z "${SERVICE_FILE}" ]
exit 0
fi
fi
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-spicehtml5proxy
diff --git a/debian/nova-scheduler.init.in b/debian/nova-scheduler.init.in
index 6b2c37ffc1..818610a388 100644
--- a/debian/nova-scheduler.init.in
+++ b/debian/nova-scheduler.init.in
@@ -18,3 +18,4 @@ NAME=${PROJECT_NAME}-scheduler
SYSTEMD_DOC="man:${NAME}(1)"
SYSTEMD_TYPE=notify
SYSTEMD_NOTIFY_ACCESS=all
+export OS_OSLO_MESSAGING_RABBIT__PROCESSNAME=nova-scheduler
Reply to: