diff --git a/ansible/roles/trove/templates/trove-guestagent.conf.j2 b/ansible/roles/trove/templates/trove-guestagent.conf.j2
index cfc1e197da..62b20698a8 100644
--- a/ansible/roles/trove/templates/trove-guestagent.conf.j2
+++ b/ansible/roles/trove/templates/trove-guestagent.conf.j2
@@ -4,3 +4,9 @@ control_exchange = trove
 root_grant = ALL
 root_grant_option = True
 debug = {{ trove_logging_debug }}
+
+[oslo_messaging_rabbit]
+heartbeat_in_pthread = false
+{% if om_enable_rabbitmq_high_availability | bool %}
+amqp_durable_queues = true
+{% endif %}
diff --git a/releasenotes/notes/fix-trove-bug-64e0f1e17018882c.yaml b/releasenotes/notes/fix-trove-bug-64e0f1e17018882c.yaml
new file mode 100644
index 0000000000..08849d1359
--- /dev/null
+++ b/releasenotes/notes/fix-trove-bug-64e0f1e17018882c.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fix a trove deployment bug where trove guest-agent failed to connect
+    to RabbitMQ due to the missing of the `oslo_messaging_rabbit` config in
+    `guest-agent.conf`.
+    see `bug 2048822 <https://bugs.launchpad.net/kolla-ansible/+bug/2048822>`__