diff --git a/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit-ocata b/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit-ocata
new file mode 100644
index 0000000..365f437
--- /dev/null
+++ b/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit-ocata
@@ -0,0 +1,10 @@
+[oslo_messaging_rabbit]
+{% if rabbitmq_ha_queues -%}
+rabbit_ha_queues = True
+{% endif -%}
+{% if rabbit_ssl_port -%}
+rabbit_use_ssl = True
+{% endif -%}
+{% if rabbit_ssl_ca -%}
+ssl_ca_file = {{ rabbit_ssl_ca }}
+{% endif -%}
diff --git a/templates/ocata/ceilometer.conf b/templates/ocata/ceilometer.conf
index 438164f..cc550e7 100644
--- a/templates/ocata/ceilometer.conf
+++ b/templates/ocata/ceilometer.conf
@@ -76,4 +76,4 @@ url = {{ gnocchi_url }}
 
 {% include "section-keystone-authtoken-mitaka" %}
 
-{% include "section-oslo-messaging-rabbit" %}
+{% include "section-oslo-messaging-rabbit-ocata" %}