diff --git a/components/cinder/values.yaml b/components/cinder/values.yaml index 1c4492e25..71a7a5092 100644 --- a/components/cinder/values.yaml +++ b/components/cinder/values.yaml @@ -14,8 +14,16 @@ conf: volume_backend_name: netapp_nvme volume_driver: cinder_understack.dynamic_netapp_driver.NetappCinderDynamicDriver cinder: + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true DEFAULT: enabled_backends: netapp_nvme default_volume_type: __DEFAULT__ diff --git a/components/glance/values.yaml b/components/glance/values.yaml index e7bee08d6..4f2e84864 100644 --- a/components/glance/values.yaml +++ b/components/glance/values.yaml @@ -116,8 +116,16 @@ pod: conf: glance: + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true glance_api_uwsgi: uwsgi: # This should be set to anything larger than 1. diff --git a/components/ironic/values.yaml b/components/ironic/values.yaml index 28eb2c280..a175221e3 100644 --- a/components/ironic/values.yaml +++ b/components/ironic/values.yaml @@ -89,8 +89,16 @@ conf: post_deploy_get_power_state_retry_interval: 18 dhcp: dhcp_provider: dnsmasq + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true pxe: loader_file_paths: "snponly.efi:/usr/lib/ipxe/snponly.efi" inspector: diff --git a/components/keystone/values.yaml b/components/keystone/values.yaml index 517a300b1..13ac85f69 100644 --- a/components/keystone/values.yaml +++ b/components/keystone/values.yaml @@ -189,8 +189,16 @@ conf: backend_argument: memcached_expire_time:3600 DEFAULT: max_token_size: 512 + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true wsgi_keystone: | {{- $portInt := tuple "identity" "service" "api" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }} diff --git a/components/neutron/values.yaml b/components/neutron/values.yaml index 563959c09..bef4cc19b 100644 --- a/components/neutron/values.yaml +++ b/components/neutron/values.yaml @@ -83,8 +83,16 @@ conf: default_availability_zones: "" # add 50 to the max MTU we want of 9000 to handle Neutron's -50 for VXLAN type global_physnet_mtu: 9050 + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true # https://docs.openstack.org/large-scale/journey/configure/rabbitmq.html#rabbit-transient-queues-ttl rabbit_transient_queues_ttl: 300 service_providers: diff --git a/components/nova/values.yaml b/components/nova/values.yaml index 75006c117..1e68a6fb8 100644 --- a/components/nova/values.yaml +++ b/components/nova/values.yaml @@ -59,6 +59,18 @@ conf: # this is where we populate our hardware project_domain_name: infra project_name: baremetal + oslo_messaging_notifications: + driver: messagingv2 + oslo_messaging_rabbit: + amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true + oslo_concurrency: + lock_path: /var/lock nova: quota: # adjust default quotas to make it possible to use baremetal @@ -76,8 +88,16 @@ conf: ironic: api_max_retries: 90 # number of times to retry. default is 60. api_retry_interval: 10 # number of sesconds between retries. default is 2. + oslo_messaging_notifications: + driver: messagingv2 oslo_messaging_rabbit: amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true # https://docs.openstack.org/nova/2025.2/admin/scheduling.html#the-filter-scheduler filter_scheduler: @@ -93,10 +113,6 @@ conf: uwsgi: processes: 2 - # Enable oslo.messaging notifications for Argo Events integration - oslo_messaging_notifications: - driver: messagingv2 - console: # we are working with baremetal nodes and not QEMU so we don't need novnc or spice # connected to QEMU diff --git a/components/octavia/values.yaml b/components/octavia/values.yaml index 6163fdf0f..94ff4ad7e 100644 --- a/components/octavia/values.yaml +++ b/components/octavia/values.yaml @@ -47,8 +47,16 @@ conf: ovn_sb_connection: tcp:ovn-ovsdb-sb.openstack.svc.cluster.local:6642 task_flow: jobboard_enabled: false - oslo_messaging_rabbit: - amqp_durable_queues: true + oslo_messaging_notifications: + driver: messagingv2 + oslo_messaging_rabbit: + amqp_durable_queues: true + rabbit_ha_queues: false + rabbit_quorum_queue: true + rabbit_transient_quorum_queue: true + rabbit_qos_prefetch_count: 1 + use_queue_manager: true + rabbit_stream_fanout: true dependencies: dynamic: diff --git a/components/openstack/templates/openstack-cluster.yaml.tpl b/components/openstack/templates/openstack-cluster.yaml.tpl index cee48239c..227c4d509 100644 --- a/components/openstack/templates/openstack-cluster.yaml.tpl +++ b/components/openstack/templates/openstack-cluster.yaml.tpl @@ -9,7 +9,7 @@ metadata: spec: replicas: 3 persistence: {{ .Values.rabbitmq.persistence | toJson }} - image: {{ .Values.rabbitmq.image | default "rabbitmq:3.13.7-management" }} # renovate:ignore + image: {{ .Values.rabbitmq.image | default "rabbitmq:4.1.1-management" }} # renovate:ignore resources: {{ .Values.rabbitmq.resources | toJson }} affinity: nodeAffinity: diff --git a/operators/rabbitmq-system/cluster-operator/kustomization.yaml b/operators/rabbitmq-system/cluster-operator/kustomization.yaml index 1af5f45c3..fd23aaf7f 100644 --- a/operators/rabbitmq-system/cluster-operator/kustomization.yaml +++ b/operators/rabbitmq-system/cluster-operator/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/rabbitmq/cluster-operator/releases/download/v2.16.1/cluster-operator.yml + - https://github.com/rabbitmq/cluster-operator/releases/download/v2.19.2/cluster-operator.yml # this needs to be here to remove the namespace from the above # because the cluster-operator defines the same namespace and it would conflict diff --git a/operators/rabbitmq-system/messaging-topology/kustomization.yaml b/operators/rabbitmq-system/messaging-topology/kustomization.yaml index 269cb8f67..0d892ce57 100644 --- a/operators/rabbitmq-system/messaging-topology/kustomization.yaml +++ b/operators/rabbitmq-system/messaging-topology/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://github.com/rabbitmq/messaging-topology-operator/releases/download/v1.17.4/messaging-topology-operator-with-certmanager.yaml + - https://github.com/rabbitmq/messaging-topology-operator/releases/download/v1.19.0/messaging-topology-operator-with-certmanager.yaml # this needs to be here to remove the namespace from the above # because the messaging-topology-operator defines the same namespace and it would conflict patches: