diff --git a/templates/grizzly/quantum.conf b/templates/grizzly/quantum.conf
index ef0ff21f..4f61430e 100644
--- a/templates/grizzly/quantum.conf
+++ b/templates/grizzly/quantum.conf
@@ -1,5 +1,6 @@
 [DEFAULT]
 verbose = True
+
 {% if rabbitmq_host or rabbitmq_hosts -%}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
@@ -9,11 +10,19 @@ rabbit_hosts = {{ rabbitmq_hosts }}
 {% if rabbitmq_ha_queues -%}
 rabbit_ha_queues = true
 rabbit_durable_queues = false
-{% endif %}
-{% else %}
+{% 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 -%}
+
 debug = True
 bind_host = 0.0.0.0
 bind_port = 9696
diff --git a/templates/havana/neutron.conf b/templates/havana/neutron.conf
index d484aa72..ba1223de 100644
--- a/templates/havana/neutron.conf
+++ b/templates/havana/neutron.conf
@@ -11,7 +11,7 @@ rabbit_hosts = {{ rabbitmq_hosts }}
 rabbit_ha_queues = true
 rabbit_durable_queues = false
 {% endif -%}
-{% else %}
+{% else -%}
 rabbit_host = {{ rabbitmq_host }}
 {% endif -%}
 {% if rabbit_ssl_port -%}
diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index 682318da..f6ebedcb 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -14,7 +14,7 @@ rabbit_hosts = {{ rabbitmq_hosts }}
 rabbit_ha_queues = true
 rabbit_durable_queues = false
 {% endif -%}
-{% else %}
+{% else -%}
 rabbit_host = {{ rabbitmq_host }}
 {% endif -%}
 {% if rabbit_ssl_port -%}