From 00827e6177ab7f6a7b30bf624298455a5ec920b4 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 24 Mar 2015 17:56:15 +0000
Subject: [PATCH] Add sectional database config for kilo

---
 templates/kilo/nova.conf         | 4 ++--
 templates/parts/section-database | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 templates/parts/section-database

diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf
index 990d1066..3e8cdf1a 100644
--- a/templates/kilo/nova.conf
+++ b/templates/kilo/nova.conf
@@ -21,8 +21,6 @@ auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
 my_ip = {{ host_ip }}
 
-{% include "parts/database" %}
-
 {% if console_vnc_type -%}
 vnc_enabled = True
 novnc_enabled = True
@@ -136,6 +134,8 @@ live_migration_uri = {{ live_migration_uri }}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
 
+{% include "parts/section-database" %}
+
 {% include "parts/section-rabbitmq" %}
 
 [oslo_concurrency]
diff --git a/templates/parts/section-database b/templates/parts/section-database
new file mode 100644
index 00000000..ae4a5ba0
--- /dev/null
+++ b/templates/parts/section-database
@@ -0,0 +1,4 @@
+{% if database_host -%}
+[database]
+connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
+{% endif -%}