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

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index c179765b7..46e8e8ed5 100644
--- a/trusty/debian/neutron-common.config.in
+++ b/trusty/debian/neutron-common.config.in
@@ -52,6 +52,9 @@ neutron_core_plugin_to_plugin_name () {
 	"neutron.plugins.mlnx.mlnx_plugin.MellanoxEswitchPlugin")
 		NEUTRON_PLUGIN_NAME=Mellanox
 	;;
+	"vmware_nsx.plugin.NsxVPlugin")
+		NEUTRON_PLUGIN_NAME=VMware
+	;;
 	*)
 		NEUTRON_PLUGIN_NAME="other"
 	;;
@@ -85,11 +88,11 @@ 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
+	pkgos_read_config -p high ${N_CONF} nova url neutron/nova_url
+	pkgos_read_config -p high ${N_CONF} nova region_name neutron/nova_region
+	pkgos_read_config -p medium ${N_CONF} nova project_name neutron/nova_admin_tenant_name
+	pkgos_read_config -p medium ${N_CONF} nova username neutron/nova_admin_username
+	pkgos_read_config -p high ${N_CONF} nova password neutron/nova_admin_password
 }
 
 # OVS specific configurations (if that's the one selected)