Fixes keystone_authtoken read in neutron-common config script

Rewritten-From: ce2e299c91eba95a744e516550e20569a5f8d456

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index f19a73fb3b516435ca5abbc42b1329fa75a2076f..993a71f17019f20a5ee63649cd56f637835a57a8 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/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/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 9427b4a8263336c3493323c1e877d1ae3cfa3f5d..f33ae38046657909a7f95127cde62b2688085b8f 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/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/