Merge "Only configure Nova DB connection if it is set"

2014-11-18 12:05:24 +00:00
parent a3ecbc4ead 6d6cc82e37
commit 367d7c555a
1 changed files with 2 additions and 0 deletions
--- a/elements/nova/os-apply-config/etc/nova/nova.conf
+++ b/elements/nova/os-apply-config/etc/nova/nova.conf
@@ -171,7 +171,9 @@ scheduler_host_manager = nova.scheduler.baremetal_host_manager.BaremetalHostMana
 {{/nova.scheduler_host_manager}}

 [database]
+{{#nova.db}}
 connection={{nova.db}}
+{{/nova.db}}

 [neutron]
 url=http://{{neutron.host}}:9696