From 5c831e12618cecba12db771088661b0c8d41fa8e Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Sat, 29 Mar 2014 09:51:25 +0000
Subject: [PATCH] Fixup nova template for SSL rabbitmq

---
 templates/grizzly/nova.conf | 17 ++++++++++++-----
 templates/havana/nova.conf  | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/templates/grizzly/nova.conf b/templates/grizzly/nova.conf
index f79a9e9a..85477e9b 100644
--- a/templates/grizzly/nova.conf
+++ b/templates/grizzly/nova.conf
@@ -12,18 +12,25 @@ quantum_metadata_proxy_shared_secret={{ shared_secret }}
 service_quantum_metadata_proxy=True
 # Access to message bus
 {% if rabbitmq_host or rabbitmq_hosts -%}
-rabbit_userid={{ rabbitmq_user }}
-rabbit_virtual_host={{ rabbitmq_virtual_host }}
-rabbit_password={{ rabbitmq_password }}
+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 %}
+{% 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 -%}
 # Access to quantum API services
 network_api_class=nova.network.quantumv2.api.API
diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf
index 850514fc..d44a3a52 100644
--- a/templates/havana/nova.conf
+++ b/templates/havana/nova.conf
@@ -12,18 +12,25 @@ neutron_metadata_proxy_shared_secret={{ shared_secret }}
 service_neutron_metadata_proxy=True
 # Access to message bus
 {% if rabbitmq_host or rabbitmq_hosts -%}
-rabbit_userid={{ rabbitmq_user }}
-rabbit_virtual_host={{ rabbitmq_virtual_host }}
-rabbit_password={{ rabbitmq_password }}
+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 %}
+{% 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 -%}
 # Access to neutron API services
 network_api_class=nova.network.neutronv2.api.API