From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 31 Jul 2013 15:09:29 +0000 (+0800)
Subject: Fixes keystone_authtoken read in neutron-common config script
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ce2e299c91eba95a744e516550e20569a5f8d456;p=openstack-build%2Fneutron-build.git

Fixes keystone_authtoken read in neutron-common config script
---

diff --git a/debian/neutron-common.config.in b/debian/neutron-common.config.in
index f19a73fb3..993a71f17 100644
--- a/debian/neutron-common.config.in
+++ b/debian/neutron-common.config.in
@@ -4,13 +4,12 @@ set -e
 
 . /usr/share/debconf/confmodule
 
-QAPI_CONF=/etc/neutron/api-paste.ini
-Q_CONF=/etc/neutron/neutron.conf
+N_CONF=/etc/neutron/neutron.conf
 
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group neutron
 chmod 755 /var/lib/neutron
-pkgos_read_admin_creds ${Q_CONF} keystone_authtoken neutron
+pkgos_read_admin_creds ${N_CONF} keystone_authtoken neutron
 
 exit 0
diff --git a/debian/neutron-common.postinst.in b/debian/neutron-common.postinst.in
index 9427b4a82..f33ae3804 100644
--- a/debian/neutron-common.postinst.in
+++ b/debian/neutron-common.postinst.in
@@ -2,8 +2,7 @@
 
 set -e
 
-QAPI_CONF=/etc/neutron/api-paste.ini
-Q_CONF=/etc/neutron/neutron.conf
+N_CONF=/etc/neutron/neutron.conf
 
 #PKGOS-INCLUDE#
 
@@ -14,7 +13,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	chmod 755 /var/lib/neutron
 	pkgos_write_new_conf neutron api-paste.ini
 	pkgos_write_new_conf neutron neutron.conf
-	pkgos_write_admin_creds ${Q_CONF} keystone_authtoken neutron
+	pkgos_write_admin_creds ${N_CONF} keystone_authtoken neutron
 	db_stop
 
 	chown -R neutron:adm /var/log/neutron/