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

diff --git a/trusty/debian/neutron-common.config.in b/trusty/debian/neutron-common.config.in
index ad6da5f99..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"
 	;;
@@ -84,6 +87,14 @@ db_go
 db_get neutron/plugin-select
 NEUTRON_PLUGIN_NAME=${RET}
 
+read_nova_admin_credentials () {
+	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)
 if [ "${NEUTRON_PLUGIN_NAME}" = "OpenVSwitch" ] ; then
 	# Various network config...
@@ -91,6 +102,8 @@ 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/'`