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

2014-12-18 22:59:21 +00:00 · 2014-12-18 22:59:21 +00:00 · d1e29c525c
parent 7cb9d3a297 d1ead0cbe2
commit d1e29c525c
1 changed files with 2 additions and 0 deletions
--- a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
@ -28,7 +28,9 @@ vni_ranges = 1001:2000
 {{/neutron.vni_ranges}}

 [database]
+{{#neutron.ovs_db}}
 connection = {{neutron.ovs_db}}
+{{/neutron.ovs_db}}

 [ovs]
 local_ip = {{neutron.ovs.local_ip}}