Skip to content
Snippets Groups Projects
Commit 8b8b4a82 authored by Matt Crees's avatar Matt Crees
Browse files

Explicitly set the value of heartbeat_in_pthread

The ``[oslo_messaging_rabbit] heartbeat_in_pthread`` config option
is set to ``true`` for wsgi applications to allow the RabbitMQ
heartbeats to function. For non-wsgi applications it is set to ``false``
as it may otherwise break the service [1].

[1] https://docs.openstack.org/releasenotes/oslo.messaging/zed.html#upgrade-notes

Change-Id: Id89bd6158aff42d59040674308a8672c358ccb3c
parent 62f3c62b
No related branches found
No related tags found
No related merge requests found
...@@ -138,8 +138,9 @@ topics = {{ nova_enabled_notification_topics | map(attribute='name') | join(',') ...@@ -138,8 +138,9 @@ topics = {{ nova_enabled_notification_topics | map(attribute='name') | join(',')
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = {{ service_name == 'nova-api' }}
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -122,8 +122,9 @@ rpc_thread_pool_size = 2 ...@@ -122,8 +122,9 @@ rpc_thread_pool_size = 2
[oslo_messaging_notifications] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = {{ service_name == 'octavia-api' }}
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -40,8 +40,9 @@ topics = {{ sahara_enabled_notification_topics | map(attribute='name') | join(', ...@@ -40,8 +40,9 @@ topics = {{ sahara_enabled_notification_topics | map(attribute='name') | join(',
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -68,8 +68,9 @@ topics = {{ senlin_enabled_notification_topics | map(attribute='name') | join(', ...@@ -68,8 +68,9 @@ topics = {{ senlin_enabled_notification_topics | map(attribute='name') | join(',
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -67,8 +67,9 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres ...@@ -67,8 +67,9 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres
[oslo_messaging_notifications] [oslo_messaging_notifications]
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
...@@ -68,8 +68,9 @@ topics = {{ tacker_enabled_notification_topics | map(attribute='name') | join(', ...@@ -68,8 +68,9 @@ topics = {{ tacker_enabled_notification_topics | map(attribute='name') | join(',
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -71,8 +71,9 @@ topics = {{ trove_enabled_notification_topics | map(attribute='name') | join(',' ...@@ -71,8 +71,9 @@ topics = {{ trove_enabled_notification_topics | map(attribute='name') | join(','
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -69,8 +69,9 @@ topics = {{ vitrage_enabled_notification_topics | map(attribute='name') | join(' ...@@ -69,8 +69,9 @@ topics = {{ vitrage_enabled_notification_topics | map(attribute='name') | join('
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = {{ service_name == 'vitrage-api' }}
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -59,8 +59,9 @@ topics = {{ watcher_enabled_notification_topics | map(attribute='name') | join(' ...@@ -59,8 +59,9 @@ topics = {{ watcher_enabled_notification_topics | map(attribute='name') | join('
driver = noop driver = noop
{% endif %} {% endif %}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = false
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
......
...@@ -124,8 +124,9 @@ docker_remote_api_port = 2375 ...@@ -124,8 +124,9 @@ docker_remote_api_port = 2375
[cni_daemon] [cni_daemon]
cni_daemon_port = {{ zun_cni_daemon_port }} cni_daemon_port = {{ zun_cni_daemon_port }}
{% if om_enable_rabbitmq_tls | bool %}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
heartbeat_in_pthread = {{ service_name == 'zun-api' }}
{% if om_enable_rabbitmq_tls | bool %}
ssl = true ssl = true
ssl_ca_file = {{ om_rabbitmq_cacert }} ssl_ca_file = {{ om_rabbitmq_cacert }}
{% endif %} {% endif %}
---
fixes:
- |
The value of ``[oslo_messaging_rabbit] heartbeat_in_pthread`` is explicitly
set to either ``true`` for wsgi applications, or ``false`` otherwise.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment