diff --git a/manifests/init.pp b/manifests/init.pp
index 0cabb6bd..ffb8aad7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -89,6 +89,11 @@
 #   (optional) Use HA queues in RabbitMQ (x-ha-policy: all).
 #   Defaults to undef
 #
+# [*kombu_reconnect_delay*]
+#   (optional) How long to wait before reconnecting in response to an AMQP
+#   consumer cancel notification.
+#   Defaults to $::os_service_default
+#
 # [*amqp_durable_queues*]
 #   (optional) Define queues as "durable" to rabbitmq.
 #   Defaults to false
@@ -249,6 +254,7 @@ class trove(
   $kombu_ssl_certfile           = undef,
   $kombu_ssl_keyfile            = undef,
   $kombu_ssl_version            = 'TLSv1',
+  $kombu_reconnect_delay        = $::os_service_default,
   $amqp_durable_queues          = false,
   $database_connection          = undef,
   $database_idle_timeout        = undef,
diff --git a/spec/classes/trove_api_spec.rb b/spec/classes/trove_api_spec.rb
index 477fc0e1..609591d5 100644
--- a/spec/classes/trove_api_spec.rb
+++ b/spec/classes/trove_api_spec.rb
@@ -86,6 +86,11 @@ describe 'trove::api' do
         is_expected.to contain_trove_config('DEFAULT/http_mgmt_post_rate').with_value('200')
         is_expected.to contain_trove_config('DEFAULT/notification_driver').with_value('noop,')
         is_expected.to contain_trove_config('DEFAULT/notification_topics').with_value('notifications')
+        is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest')
+        is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_password').with_value('guest')
+        is_expected.to contain_trove_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false)
+        is_expected.to contain_trove_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_trove_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false)
       end
 
       context 'with deprecated parameters' do
diff --git a/spec/classes/trove_conductor_spec.rb b/spec/classes/trove_conductor_spec.rb
index 258fa10a..a78ba4c7 100644
--- a/spec/classes/trove_conductor_spec.rb
+++ b/spec/classes/trove_conductor_spec.rb
@@ -31,6 +31,11 @@ describe 'trove::conductor' do
         is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_user').with_value('admin')
         is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_pass').with_value('verysecrete')
         is_expected.to contain_trove_conductor_config('DEFAULT/nova_proxy_admin_tenant_name').with_value('admin')
+        is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest')
+        is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_password').with_value('guest')
+        is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false)
+        is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_trove_conductor_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false)
       end
 
       context 'when using a single RabbitMQ server' do
diff --git a/spec/classes/trove_guestagent_spec.rb b/spec/classes/trove_guestagent_spec.rb
index 3f078498..1f7e542b 100644
--- a/spec/classes/trove_guestagent_spec.rb
+++ b/spec/classes/trove_guestagent_spec.rb
@@ -35,6 +35,11 @@ describe 'trove::guestagent' do
         is_expected.to contain_trove_guestagent_config('DEFAULT/os_region_name').with_value('RegionOne')
         is_expected.to contain_trove_guestagent_config('DEFAULT/notification_driver').with_value('noop,')
         is_expected.to contain_trove_guestagent_config('DEFAULT/notification_topics').with_value('notifications')
+        is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest')
+        is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_password').with_value('guest')
+        is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false)
+        is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_trove_guestagent_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false)
       end
 
       context 'when using a single RabbitMQ server' do
diff --git a/spec/classes/trove_taskmanager_spec.rb b/spec/classes/trove_taskmanager_spec.rb
index b551091b..e5f3a501 100644
--- a/spec/classes/trove_taskmanager_spec.rb
+++ b/spec/classes/trove_taskmanager_spec.rb
@@ -68,6 +68,11 @@ describe 'trove::taskmanager' do
         is_expected.to contain_file('/etc/trove/trove-guestagent.conf')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/notification_driver').with_value('noop,')
         is_expected.to contain_trove_taskmanager_config('DEFAULT/notification_topics').with_value('notifications')
+        is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_userid').with_value('guest')
+        is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_password').with_value('guest')
+        is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/rabbit_use_ssl').with_value(false)
+        is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_trove_taskmanager_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(false)
       end
 
       context 'when set use_guestagent_template to false' do