diff --git a/templates/kilo/cinder.conf b/templates/kilo/cinder.conf
index a8f224df..33f6a500 100644
--- a/templates/kilo/cinder.conf
+++ b/templates/kilo/cinder.conf
@@ -65,7 +65,7 @@ signing_dir = {{ signing_dir }}
 
 {% include "parts/section-database" %}
 
-{% include "parts/section-rabbitmq" %}
+{% include "section-rabbitmq-oslo" %}
 
 [oslo_concurrency]
 lock_path = /var/lock/cinder
diff --git a/templates/parts/section-rabbitmq b/templates/parts/section-rabbitmq
deleted file mode 100644
index df21178b..00000000
--- a/templates/parts/section-rabbitmq
+++ /dev/null
@@ -1,22 +0,0 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
-[oslo_messaging_rabbit]
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-rabbit_password = {{ rabbitmq_password }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if rabbitmq_ha_queues -%}
-rabbit_ha_queues = True
-rabbit_durable_queues = False
-{% endif -%}
-{% else -%}
-rabbit_host = {{ rabbitmq_host }}
-{% endif -%}
-{% if rabbit_ssl_port -%}
-rabbit_use_ssl = True
-rabbit_port = {{ rabbit_ssl_port }}
-{% if rabbit_ssl_ca -%}
-kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
-{% endif -%}
-{% endif -%}
-{% endif -%}
\ No newline at end of file