From: Thomas Goirand <thomas@goirand.fr>
Date: Fri, 2 Aug 2013 12:58:26 +0000 (+0200)
Subject: chmod 0660 /etc/neutron/neutron.conf
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=effc65f7d9a1af5a259fc32b3c7436dac9e8a11d;p=openstack-build%2Fneutron-build.git

chmod 0660 /etc/neutron/neutron.conf
Config script reads the info from the correct directive.

Rewritten-From: 93a1b90025e4e276065d6cec9f0b66c50d4783f0
---

diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in
index 77efbb28a..d331800fa 100644
--- a/xenial/debian/neutron-common.config.in
+++ b/xenial/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 sql_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/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in
index 317e503e9..c1c767c4b 100644
--- a/xenial/debian/neutron-common.postinst.in
+++ b/xenial/debian/neutron-common.postinst.in
@@ -64,6 +64,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 
 	pkgos_write_new_conf neutron api-paste.ini
 	pkgos_write_new_conf neutron neutron.conf
+	chmod 0660 /etc/neutron/neutron.conf
 
 	# Maintain the /etc/default/neutron plugin type selection
 	# and fill-out the core_plugin class path in /etc/neutron/neutron.conf