diff --git a/templates/grizzly/ceilometer.conf b/templates/grizzly/ceilometer.conf
index 026c8f3..79612e5 100644
--- a/templates/grizzly/ceilometer.conf
+++ b/templates/grizzly/ceilometer.conf
@@ -7,30 +7,14 @@
 [DEFAULT]
 debug = {{ debug }}
 verbose = {{ verbose }}
-
 {% if metering_secret -%}
 metering_secret = {{ metering_secret }}
 {% endif -%}
-
-{% if rabbitmq_host -%}
-rabbit_host = {{ rabbitmq_host }}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_password = {{ rabbitmq_password }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-{% 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 -%}
-
+{% include "parts/rabbitmq" %}
 {% if auth_host -%}
 os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
 os_tenant_name = {{ admin_tenant_name }}
 os_username = {{ admin_user }}
 os_password = {{ admin_password }}
 {% endif -%}
-
 logdir = /var/log/ceilometer
diff --git a/templates/havana/ceilometer.conf b/templates/havana/ceilometer.conf
index 9b18c1e..63f346f 100644
--- a/templates/havana/ceilometer.conf
+++ b/templates/havana/ceilometer.conf
@@ -7,23 +7,8 @@
 [DEFAULT]
 debug = {{ debug }}
 verbose = {{ verbose }}
-
-{% if rabbitmq_host -%}
-rabbit_host = {{ rabbitmq_host }}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_password = {{ rabbitmq_password }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-{% 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 -%}
-
+{% include "parts/rabbitmq" %}
 logdir = /var/log/ceilometer
-
 {% if auth_host -%}
 [service_credentials]
 os_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
@@ -31,7 +16,6 @@ os_tenant_name = {{ admin_tenant_name }}
 os_username = {{ admin_user }}
 os_password = {{ admin_password }}
 {% endif -%}
-
 {% if metering_secret -%}
 [publisher_rpc]
 metering_secret = {{ metering_secret }}
diff --git a/templates/parts/rabbitmq b/templates/parts/rabbitmq
new file mode 100644
index 0000000..bbd0371
--- /dev/null
+++ b/templates/parts/rabbitmq
@@ -0,0 +1,21 @@
+{% if rabbitmq_host or rabbitmq_hosts -%}
+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