Update to 8.0.0.0b1

[openstack-build/neutron-build.git] / trusty / debian / neutron-common.postinst.in

diff --git a/trusty/debian/neutron-common.postinst.in b/trusty/debian/neutron-common.postinst.in
index 5bd927ced3afdc1fb89677e39fb6be79495b7fd7..c9010ea71e2cc7cb8985d102c26d70409484b2f1 100644 (file)
--- a/trusty/debian/neutron-common.postinst.in
+++ b/trusty/debian/neutron-common.postinst.in
@@ -57,19 +57,6 @@ neutron_core_plugin_class () {
        esac
 }
 
-write_nova_admin_credentials () {
-        db_get neutron/nova_url
-       pkgos_inifile set ${N_CONF} DEFAULT 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}
-       db_get neutron/nova_admin_username
-       pkgos_inifile set ${N_CONF} DEFAULT nova_admin_username ${RET}
-       db_get neutron/nova_admin_password
-       pkgos_inifile set ${N_CONF} DEFAULT nova_admin_password ${RET}
-}
-
 if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
        . /usr/share/debconf/confmodule
 
@@ -122,11 +109,10 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
                pkgos_inifile set ${OVS_CONF} OVS local_ip "${RET}"
        fi
 
-       write_nova_admin_credentials
        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