Skip to content

Commit 0ac2ddf

Browse files
cloudnullcloudnull
authored
feat: update rabbitmq config (#695)
* feat: update rabbitmq config Update the config to revert the use of `rabbit_transient_quorum_queue`, while this option works, it appears to be buggy and not quite ready for full scale operations. This change also sets the rabbitmq service to use the fqdn of the rabbitmq svc load-balancer. Signed-off-by: Kevin Carter <kevin.carter@rackspace.com> * fix: update keystone conf This change steals the keystone mpm event settings from OSA and transplants them here. With this change we've been able to ensure keystone is able to stand up to near constant attack. Signed-off-by: Kevin Carter <kevin.carter@rackspace.com> --------- Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
1 parent 5a06b6c commit 0ac2ddf

File tree

13 files changed

+45
-42
lines changed

13 files changed

+45
-42
lines changed

‎base-helm-configs/barbican/barbican-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,14 +415,14 @@ conf:
415415
oslo_middleware:
416416
enable_proxy_headers_parsing: true
417417
oslo_messaging_rabbit:
418-
amqp_durable_queues: true
418+
amqp_durable_queues: false
419419
# We define use of quorum queues via kustomize but this was enabling HA queues instead
420420
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
421421
rabbit_ha_queues: false
422422
rabbit_quorum_queue: true
423423
# TODO: Not available until 2024.1, but once it is, we want to enable these!
424424
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
425-
rabbit_transient_quorum_queue: true
425+
rabbit_transient_quorum_queue: false
426426
use_queue_manager: true
427427
# Reconnect after a node outage more quickly
428428
rabbit_interval_max: 10
@@ -656,7 +656,7 @@ endpoints:
656656
hosts:
657657
default: rabbitmq-nodes
658658
host_fqdn_override:
659-
default: null
659+
default: rabbitmq.openstack.svc.cluster.local
660660
path: /barbican
661661
scheme: rabbit
662662
port:

‎base-helm-configs/ceilometer/ceilometer-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ conf:
101101
oslo_concurrency:
102102
lock_path: /tmp/ceilometer
103103
oslo_messaging_rabbit:
104-
amqp_durable_queues: true
104+
amqp_durable_queues: false
105105
# We define use of quorum queues via kustomize but this was enabling HA queues instead
106106
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
107107
rabbit_ha_queues: false
108108
rabbit_quorum_queue: true
109109
# TODO: Not available until 2024.1, but once it is, we want to enable these!
110110
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
111-
rabbit_transient_quorum_queue: true
111+
rabbit_transient_quorum_queue: false
112112
use_queue_manager: true
113113
# Reconnect after a node outage more quickly
114114
rabbit_interval_max: 10
@@ -1944,7 +1944,7 @@ endpoints:
19441944
hosts:
19451945
default: rabbitmq
19461946
host_fqdn_override:
1947-
default: null
1947+
default: rabbitmq.openstack.svc.cluster.local
19481948
path: /ceilometer
19491949
scheme: rabbit
19501950
port:

‎base-helm-configs/cinder/cinder-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -830,14 +830,14 @@ conf:
830830
oslo_middleware:
831831
enable_proxy_headers_parsing: true
832832
oslo_messaging_rabbit:
833-
amqp_durable_queues: true
833+
amqp_durable_queues: false
834834
# We define use of quorum queues via kustomize but this was enabling HA queues instead
835835
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
836836
rabbit_ha_queues: false
837837
rabbit_quorum_queue: true
838838
# TODO: Not available until 2024.1, but once it is, we want to enable these!
839839
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
840-
rabbit_transient_quorum_queue: true
840+
rabbit_transient_quorum_queue: false
841841
use_queue_manager: true
842842
# Reconnect after a node outage more quickly
843843
rabbit_interval_max: 10
@@ -1369,7 +1369,7 @@ endpoints:
13691369
hosts:
13701370
default: rabbitmq-nodes
13711371
host_fqdn_override:
1372-
default: null
1372+
default: rabbitmq.openstack.svc.cluster.local
13731373
path: /cinder
13741374
scheme: rabbit
13751375
port:

‎base-helm-configs/designate/designate-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,14 +476,14 @@ conf:
476476
oslo_messaging_notifications:
477477
driver: messagingv2
478478
oslo_messaging_rabbit:
479-
amqp_durable_queues: true
479+
amqp_durable_queues: false
480480
# We define use of quorum queues via kustomize but this was enabling HA queues instead
481481
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
482482
rabbit_ha_queues: false
483483
rabbit_quorum_queue: true
484484
# TODO: Not available until 2024.1, but once it is, we want to enable these!
485485
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
486-
rabbit_transient_quorum_queue: true
486+
rabbit_transient_quorum_queue: false
487487
use_queue_manager: true
488488
# Reconnect after a node outage more quickly
489489
rabbit_interval_max: 10
@@ -723,7 +723,7 @@ endpoints:
723723
hosts:
724724
default: rabbitmq-nodes
725725
host_fqdn_override:
726-
default: null
726+
default: rabbitmq.openstack.svc.cluster.local
727727
path: /designate
728728
scheme: rabbit
729729
port:

‎base-helm-configs/glance/glance-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,14 @@ conf:
271271
oslo_messaging_notifications:
272272
driver: messagingv2
273273
oslo_messaging_rabbit:
274-
amqp_durable_queues: true
274+
amqp_durable_queues: false
275275
# We define use of quorum queues via kustomize but this was enabling HA queues instead
276276
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
277277
rabbit_ha_queues: false
278278
rabbit_quorum_queue: true
279279
# TODO: Not available until 2024.1, but once it is, we want to enable these!
280280
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
281-
rabbit_transient_quorum_queue: true
281+
rabbit_transient_quorum_queue: false
282282
use_queue_manager: true
283283
# Reconnect after a node outage more quickly
284284
rabbit_interval_max: 10
@@ -648,7 +648,7 @@ endpoints:
648648
hosts:
649649
default: rabbitmq-nodes
650650
host_fqdn_override:
651-
default: null
651+
default: rabbitmq.openstack.svc.cluster.local
652652
path: /glance
653653
scheme: rabbit
654654
port:

‎base-helm-configs/heat/heat-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,14 +375,14 @@ conf:
375375
oslo_concurrency:
376376
lock_path: /tmp/heat
377377
oslo_messaging_rabbit:
378-
amqp_durable_queues: true
378+
amqp_durable_queues: false
379379
# We define use of quorum queues via kustomize but this was enabling HA queues instead
380380
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
381381
rabbit_ha_queues: false
382382
rabbit_quorum_queue: true
383383
# TODO: Not available until 2024.1, but once it is, we want to enable these!
384384
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
385-
rabbit_transient_quorum_queue: true
385+
rabbit_transient_quorum_queue: false
386386
use_queue_manager: true
387387
# Reconnect after a node outage more quickly
388388
rabbit_interval_max: 10
@@ -913,7 +913,7 @@ endpoints:
913913
hosts:
914914
default: rabbitmq-nodes
915915
host_fqdn_override:
916-
default: null
916+
default: rabbitmq.openstack.svc.cluster.local
917917
path: /heat
918918
scheme: rabbit
919919
port:

‎base-helm-configs/keystone/keystone-helm-overrides.yaml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -527,14 +527,14 @@ conf:
527527
oslo_messaging_notifications:
528528
driver: messagingv2
529529
oslo_messaging_rabbit:
530-
amqp_durable_queues: true
530+
amqp_durable_queues: false
531531
# We define use of quorum queues via kustomize but this was enabling HA queues instead
532532
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
533533
rabbit_ha_queues: false
534534
rabbit_quorum_queue: true
535535
# TODO: Not available until 2024.1, but once it is, we want to enable these!
536536
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
537-
rabbit_transient_quorum_queue: true
537+
rabbit_transient_quorum_queue: false
538538
use_queue_manager: true
539539
# Reconnect after a node outage more quickly
540540
rabbit_interval_max: 10
@@ -758,13 +758,15 @@ conf:
758758
max: 0
759759
mpm_event: |
760760
<IfModule mpm_event_module>
761-
ServerLimit 1024
761+
ServerLimit 16
762762
StartServers 32
763763
MinSpareThreads 32
764-
MaxSpareThreads 256
765-
ThreadsPerChild 25
766-
MaxRequestsPerChild 128
767-
ThreadLimit 720
764+
MaxSpareThreads 128
765+
ThreadLimit 64
766+
ThreadsPerChild 16
767+
MaxRequestWorkers 256
768+
MaxMemFree 256
769+
MaxConnectionsPerChild 0
768770
</IfModule>
769771
wsgi_keystone: |
770772
{{- $portInt := tuple "identity" "service" "api" $ | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
@@ -779,11 +781,12 @@ conf:
779781
CustomLog /dev/stdout proxy env=forwarded
780782
781783
<VirtualHost *:{{ $portInt }}>
782-
WSGIDaemonProcess keystone-public processes=1 threads=1 user=keystone group=keystone display-name=%{GROUP}
784+
WSGIDaemonProcess keystone-public processes=2 threads=8 user=keystone group=keystone display-name=%{GROUP}
783785
WSGIProcessGroup keystone-public
784786
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
785787
WSGIApplicationGroup %{GLOBAL}
786788
WSGIPassAuthorization On
789+
LimitRequestBody 114688
787790
<IfVersion >= 2.4>
788791
ErrorLogFormat "%{cu}t %M"
789792
</IfVersion>
@@ -1016,7 +1019,7 @@ endpoints:
10161019
hosts:
10171020
default: rabbitmq-nodes
10181021
host_fqdn_override:
1019-
default: null
1022+
default: rabbitmq.openstack.svc.cluster.local
10201023
path: /keystone
10211024
scheme: rabbit
10221025
port:

‎base-helm-configs/magnum/magnum-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ conf:
105105
oslo_concurrency:
106106
lock_path: /tmp/magnum
107107
oslo_messaging_rabbit:
108-
amqp_durable_queues: true
108+
amqp_durable_queues: false
109109
# We define use of quorum queues via kustomize but this was enabling HA queues instead
110110
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
111111
rabbit_ha_queues: false
112112
rabbit_quorum_queue: true
113113
# TODO: Not available until 2024.1, but once it is, we want to enable these!
114114
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
115-
rabbit_transient_quorum_queue: true
115+
rabbit_transient_quorum_queue: false
116116
use_queue_manager: true
117117
# Reconnect after a node outage more quickly
118118
rabbit_interval_max: 10
@@ -506,7 +506,7 @@ endpoints:
506506
hosts:
507507
default: rabbitmq-nodes
508508
host_fqdn_override:
509-
default: null
509+
default: rabbitmq.openstack.svc.cluster.local
510510
path: /magnum
511511
scheme: rabbit
512512
port:

‎base-helm-configs/neutron/neutron-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1809,14 +1809,14 @@ conf:
18091809
oslo_messaging_notifications:
18101810
driver: messagingv2
18111811
oslo_messaging_rabbit:
1812-
amqp_durable_queues: true
1812+
amqp_durable_queues: false
18131813
# We define use of quorum queues via kustomize but this was enabling HA queues instead
18141814
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
18151815
rabbit_ha_queues: false
18161816
rabbit_quorum_queue: true
18171817
# TODO: Not available until 2024.1, but once it is, we want to enable these!
18181818
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
1819-
rabbit_transient_quorum_queue: true
1819+
rabbit_transient_quorum_queue: false
18201820
use_queue_manager: true
18211821
# Reconnect after a node outage more quickly
18221822
rabbit_interval_max: 10
@@ -2257,7 +2257,7 @@ endpoints:
22572257
hosts:
22582258
default: rabbitmq-nodes
22592259
host_fqdn_override:
2260-
default: null
2260+
default: rabbitmq.openstack.svc.cluster.local
22612261
path: /neutron
22622262
scheme: rabbit
22632263
port:

‎base-helm-configs/nova/nova-helm-overrides.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,14 +1460,14 @@ conf:
14601460
oslo_messaging_notifications:
14611461
driver: messagingv2
14621462
oslo_messaging_rabbit:
1463-
amqp_durable_queues: true
1463+
amqp_durable_queues: false
14641464
# We define use of quorum queues via kustomize but this was enabling HA queues instead
14651465
# ha_queues are deprecated, explicitly set to false and set quorum_queue true
14661466
rabbit_ha_queues: false
14671467
rabbit_quorum_queue: true
14681468
# TODO: Not available until 2024.1, but once it is, we want to enable these!
14691469
# new feature ref; https://docs.openstack.org/releasenotes/oslo.messaging/2024.1.html
1470-
rabbit_transient_quorum_queue: true
1470+
rabbit_transient_quorum_queue: false
14711471
use_queue_manager: true
14721472
# Reconnect after a node outage more quickly
14731473
rabbit_interval_max: 10
@@ -1715,7 +1715,7 @@ endpoints:
17151715
hosts:
17161716
default: rabbitmq-nodes
17171717
host_fqdn_override:
1718-
default: null
1718+
default: rabbitmq.openstack.svc.cluster.local
17191719
path: /nova
17201720
scheme: rabbit
17211721
port:

0 commit comments

Comments
 (0)