Do not manage nova_admin_* options from templates

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

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index c179765b799db90d1848ad24cc0dc1e948992bfa..ad6da5f9981c679043b3ab275bb1cb5b419c75ce 100644 (file)
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -84,14 +84,6 @@ db_go
 db_get neutron/plugin-select
 NEUTRON_PLUGIN_NAME=${RET}
 
-read_nova_admin_credentials () {
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_url neutron/nova_url
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_region_name neutron/nova_region
-       pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_tenant_id neutron/nova_admin_tenant_id
-       pkgos_read_config -p medium ${N_CONF} DEFAULT nova_admin_username neutron/nova_admin_username
-       pkgos_read_config -p high ${N_CONF} DEFAULT nova_admin_password neutron/nova_admin_password
-}
-
 # OVS specific configurations (if that's the one selected)
 if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
        # Various network config...
@@ -99,8 +91,6 @@ if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
        pkgos_read_config ${OVS_CONF} OVS enable_tunneling      neutron/enable_tunneling
        pkgos_read_config ${OVS_CONF} OVS tunnel_id_ranges      neutron/tunnel_id_ranges
 
-       read_nova_admin_credentials
-
        # Guess values to put in the local_ip directive
        IF=`LC_ALL=C route | grep default |awk -- '{ print $8 }'`
        guessed_ip_addr=`LC_ALL=C ifconfig ${IF} | grep 'inet addr' | sed 's/.\+inet addr:\([0-9.]\+\).\+/\1/'`