X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fneutron-common.postinst.in;h=e65290df94c9782da6c3f89f1aa8464903884577;hb=HEAD;hp=5bd927ced3afdc1fb89677e39fb6be79495b7fd7;hpb=33f494780fed13daabda23be6ceef83210e1d403;p=openstack-build%2Fneutron-build.git

diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 5bd927ced..e65290df9 100644
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -59,15 +59,21 @@ neutron_core_plugin_class () {
 
 write_nova_admin_credentials () {
         db_get neutron/nova_url
-	pkgos_inifile set ${N_CONF} DEFAULT nova_url ${RET}
+	pkgos_inifile set ${N_CONF} nova url ${RET}
+
 	db_get neutron/nova_region
-	pkgos_inifile set ${N_CONF} DEFAULT nova_region_name ${RET}
-	db_get neutron/nova_admin_tenant_id
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_tenant_id ${RET}
+	pkgos_inifile set ${N_CONF} nova region_name ${RET}
+
+	db_get neutron/nova_admin_tenant_name
+	NOVA_TENANT_NAME_IN_NEUTRON=${RET}
+	pkgos_inifile set ${N_CONF} nova tenant_name ${RET}
+	pkgos_inifile set ${N_CONF} nova project_name ${RET}
+
 	db_get neutron/nova_admin_username
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_username ${RET}
+	pkgos_inifile set ${N_CONF} nova username ${RET}
+
 	db_get neutron/nova_admin_password
-	pkgos_inifile set ${N_CONF} DEFAULT nova_admin_password ${RET}
+	pkgos_inifile set ${N_CONF} nova password ${RET}
 }
 
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
@@ -126,7 +132,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	db_stop
 
 	chown -R neutron:adm /var/log/neutron/
-	chmod 0750 /etc/neutron
+	chmod 0700 /etc/neutron
 	chmod 0750 /var/log/neutron/
 	chown root:root /etc/neutron/rootwrap.conf
 	chown root:root /etc/neutron/rootwrap.d