diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index b92ffdd334..428a85e144 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -60,8 +60,9 @@ topics = {{ aodh_enabled_notification_topics | map(attribute='name') | join(',') driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'aodh-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2 index 4ea9f53b46..d4e5c2ba71 100644 --- a/ansible/roles/barbican/templates/barbican.conf.j2 +++ b/ansible/roles/barbican/templates/barbican.conf.j2 @@ -78,8 +78,9 @@ topics = {{ barbican_enabled_notification_topics | map(attribute='name') | join( driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/blazar/templates/blazar.conf.j2 b/ansible/roles/blazar/templates/blazar.conf.j2 index 7311b66ecc..f76d38b130 100644 --- a/ansible/roles/blazar/templates/blazar.conf.j2 +++ b/ansible/roles/blazar/templates/blazar.conf.j2 @@ -53,8 +53,9 @@ topics = {{ blazar_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 index a02ad6ed14..550639e2ac 100644 --- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 +++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2 @@ -35,8 +35,9 @@ ca_file = /etc/ceilometer/vmware_ca [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index 0698f5e02a..3a518df9f8 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -65,8 +65,9 @@ topics = {{ cinder_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'cinder-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 index 30ddb21ad4..b27ce6b725 100644 --- a/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 +++ b/ansible/roles/cloudkitty/templates/cloudkitty.conf.j2 @@ -44,8 +44,9 @@ lock_path = /var/lib/cloudkitty/tmp policy_file = {{ cloudkitty_policy_file }} {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'cloudkitty-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2 index 22d95bc103..3e46b43086 100644 --- a/ansible/roles/cyborg/templates/cyborg.conf.j2 +++ b/ansible/roles/cyborg/templates/cyborg.conf.j2 @@ -57,8 +57,9 @@ topics = {{ cyborg_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index 368a5280cc..0931b7e7ec 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -92,8 +92,9 @@ topics = {{ designate_enabled_notification_topics | map(attribute='name') | join driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index 7df76e18db..a9be163af7 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -120,8 +120,9 @@ topics = {{ glance_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 54c9c6e689..4cec4a4b91 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -72,8 +72,9 @@ topics = {{ heat_enabled_notification_topics | map(attribute='name') | join(',') driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'heat-api' or service_name == 'heat-api-cfn' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 index 278c7144df..26c66f15a2 100644 --- a/ansible/roles/ironic/templates/ironic-inspector.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-inspector.conf.j2 @@ -12,8 +12,9 @@ transport_url = {{ rpc_transport_url }} [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = true +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index 6bf0cd18f2..dc58ffbb27 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -27,8 +27,9 @@ topics = {{ ironic_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'ironic-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index 92f317ab32..2b5f13bcab 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -59,8 +59,9 @@ topics = {{ keystone_enabled_notification_topics | map(attribute='name') | join( driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'keystone' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index e0a2e0a9cd..6b57b291bd 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -126,8 +126,9 @@ topics = {{ magnum_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/manila/templates/manila.conf.j2 b/ansible/roles/manila/templates/manila.conf.j2 index 0151d2b5e4..165d1b001e 100644 --- a/ansible/roles/manila/templates/manila.conf.j2 +++ b/ansible/roles/manila/templates/manila.conf.j2 @@ -56,8 +56,9 @@ topics = {{ manila_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/masakari/templates/masakari.conf.j2 b/ansible/roles/masakari/templates/masakari.conf.j2 index 6575690348..99410d3e43 100644 --- a/ansible/roles/masakari/templates/masakari.conf.j2 +++ b/ansible/roles/masakari/templates/masakari.conf.j2 @@ -50,8 +50,9 @@ topics = notifications driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'masakari-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2 index 45d39e38e6..cbee0050ff 100644 --- a/ansible/roles/mistral/templates/mistral.conf.j2 +++ b/ansible/roles/mistral/templates/mistral.conf.j2 @@ -72,8 +72,9 @@ topics = {{ mistral_enabled_notification_topics | map(attribute='name') | join(' driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2 index fa4797e776..132894e88e 100644 --- a/ansible/roles/murano/templates/murano.conf.j2 +++ b/ansible/roles/murano/templates/murano.conf.j2 @@ -61,8 +61,9 @@ topics = {{ murano_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index ee5bcf65ab..9b0dce42ed 100644 --- a/ansible/roles/neutron/templates/neutron.conf.j2 +++ b/ansible/roles/neutron/templates/neutron.conf.j2 @@ -137,8 +137,9 @@ topics = {{ neutron_enabled_notification_topics | map(attribute='name') | join(' driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/nova-cell/templates/nova.conf.j2 b/ansible/roles/nova-cell/templates/nova.conf.j2 index 114480def4..3d3d79c749 100644 --- a/ansible/roles/nova-cell/templates/nova.conf.j2 +++ b/ansible/roles/nova-cell/templates/nova.conf.j2 @@ -184,8 +184,9 @@ topics = {{ nova_enabled_notification_topics | map(attribute='name') | join(',') driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index 50f169ab08..c7121a899e 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -138,8 +138,9 @@ topics = {{ nova_enabled_notification_topics | map(attribute='name') | join(',') driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'nova-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/octavia/templates/octavia.conf.j2 b/ansible/roles/octavia/templates/octavia.conf.j2 index 5a23a0f563..92c6362309 100644 --- a/ansible/roles/octavia/templates/octavia.conf.j2 +++ b/ansible/roles/octavia/templates/octavia.conf.j2 @@ -122,8 +122,9 @@ rpc_thread_pool_size = 2 [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'octavia-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2 index 2fc1edd5ec..a77ea56380 100644 --- a/ansible/roles/sahara/templates/sahara.conf.j2 +++ b/ansible/roles/sahara/templates/sahara.conf.j2 @@ -40,8 +40,9 @@ topics = {{ sahara_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2 index 1a4259d09c..70b0d65887 100644 --- a/ansible/roles/senlin/templates/senlin.conf.j2 +++ b/ansible/roles/senlin/templates/senlin.conf.j2 @@ -68,8 +68,9 @@ topics = {{ senlin_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/solum/templates/solum.conf.j2 b/ansible/roles/solum/templates/solum.conf.j2 index a62dc6fde7..3afbb32e51 100644 --- a/ansible/roles/solum/templates/solum.conf.j2 +++ b/ansible/roles/solum/templates/solum.conf.j2 @@ -67,8 +67,9 @@ memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_addres [oslo_messaging_notifications] transport_url = {{ notify_transport_url }} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/tacker/templates/tacker.conf.j2 b/ansible/roles/tacker/templates/tacker.conf.j2 index c5fff78155..fb70199b94 100644 --- a/ansible/roles/tacker/templates/tacker.conf.j2 +++ b/ansible/roles/tacker/templates/tacker.conf.j2 @@ -68,8 +68,9 @@ topics = {{ tacker_enabled_notification_topics | map(attribute='name') | join(', driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index 993fe7984c..fb1c8ba072 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -71,8 +71,9 @@ topics = {{ trove_enabled_notification_topics | map(attribute='name') | join(',' driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/vitrage/templates/vitrage.conf.j2 b/ansible/roles/vitrage/templates/vitrage.conf.j2 index f4750491b8..f4603ac9ac 100644 --- a/ansible/roles/vitrage/templates/vitrage.conf.j2 +++ b/ansible/roles/vitrage/templates/vitrage.conf.j2 @@ -69,8 +69,9 @@ topics = {{ vitrage_enabled_notification_topics | map(attribute='name') | join(' driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'vitrage-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/watcher/templates/watcher.conf.j2 b/ansible/roles/watcher/templates/watcher.conf.j2 index c1c6213b9b..ea4ef98ad1 100644 --- a/ansible/roles/watcher/templates/watcher.conf.j2 +++ b/ansible/roles/watcher/templates/watcher.conf.j2 @@ -59,8 +59,9 @@ topics = {{ watcher_enabled_notification_topics | map(attribute='name') | join(' driver = noop {% endif %} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = false +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2 index 55b6613d63..31bd7ae641 100644 --- a/ansible/roles/zun/templates/zun.conf.j2 +++ b/ansible/roles/zun/templates/zun.conf.j2 @@ -124,8 +124,9 @@ docker_remote_api_port = 2375 [cni_daemon] cni_daemon_port = {{ zun_cni_daemon_port }} -{% if om_enable_rabbitmq_tls | bool %} [oslo_messaging_rabbit] +heartbeat_in_pthread = {{ service_name == 'zun-api' }} +{% if om_enable_rabbitmq_tls | bool %} ssl = true ssl_ca_file = {{ om_rabbitmq_cacert }} {% endif %} diff --git a/releasenotes/notes/explicitly-set-heartbeat-in-pthread-3a5a3ebdc33bb51a.yaml b/releasenotes/notes/explicitly-set-heartbeat-in-pthread-3a5a3ebdc33bb51a.yaml new file mode 100644 index 0000000000..2ad7835d6a --- /dev/null +++ b/releasenotes/notes/explicitly-set-heartbeat-in-pthread-3a5a3ebdc33bb51a.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The value of ``[oslo_messaging_rabbit] heartbeat_in_pthread`` is explicitly + set to either ``true`` for wsgi applications, or ``false`` otherwise.