From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 2 Aug 2013 13:34:52 +0000 (+0200)
Subject: Correct direct and section for SQL "connection" directive.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6834a5361b80c4467e5998cb2b62b9454bfac81e;p=openstack-build%2Fneutron-build.git

Correct direct and section for SQL "connection" directive.

Rewritten-From: 51a55c6803aa3346fb893bdd78c89b4ec9fd2648
---

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index d331800fa..67b52ffae 100644
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -13,7 +13,7 @@ pkgos_var_user_group neutron
 chmod 755 /var/lib/neutron
 
 # Configure the SQL connection
-pkgos_dbc_read_conf -pkg neutron-common ${OVS_CONF} DATABASE connection neutron $@
+pkgos_dbc_read_conf -pkg neutron-common ${OVS_CONF} database connection neutron $@
 
 # Configure the keystone_authtoken
 pkgos_read_admin_creds ${N_CONF} keystone_authtoken neutron
diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index c1c767c4b..0cc79c38d 100644
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -84,7 +84,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	pkgos_write_admin_creds ${N_CONF} keystone_authtoken neutron
 
 	# Set the sql_connection directive
-        pkgos_dbc_postinst --suite neutron ${N_CONF} DATABASE sql_connection neutron $@
+        pkgos_dbc_postinst --suite neutron ${N_CONF} database connection neutron $@
 
 	# Maintain the OVS config
         if [ ! -e ${OVS_CONF} ] ; then