From 48a48e2a83e84988bfeab2d310c2abfea94171ac Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 31 Jul 2013 23:09:29 +0800 Subject: [PATCH] Fixes keystone_authtoken read in neutron-common config script Rewritten-From: ce2e299c91eba95a744e516550e20569a5f8d456 --- xenial/debian/neutron-common.config.in | 5 ++--- xenial/debian/neutron-common.postinst.in | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xenial/debian/neutron-common.config.in b/xenial/debian/neutron-common.config.in index f19a73fb3..993a71f17 100644 --- a/xenial/debian/neutron-common.config.in +++ b/xenial/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/xenial/debian/neutron-common.postinst.in b/xenial/debian/neutron-common.postinst.in index 9427b4a82..f33ae3804 100644 --- a/xenial/debian/neutron-common.postinst.in +++ b/xenial/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/ -- 2.45.2