x/vmware-nsx
Code Issues Proposed changes

Ensure that DHCP agent is configured with correct bridge name

Browse Source 
If a bridge that is not br-int is used then devstack fails to get
the DHCP agent up and running.

Change-Id: I7e49e309e26754345c2a06e7758b41aefd464290
This commit is contained in:
Gary Kotton 2015-09-16 04:31:27 -07:00
parent 7a3340e13a
commit b7175773dc
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/lib/vmware_dvs
View File

@ -72,6 +72,7 @@ function neutron_plugin_configure_debug_command {
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {

1
devstack/lib/vmware_nsx
View File

@ -75,6 +75,7 @@ function neutron_plugin_configure_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {

1
devstack/lib/vmware_nsx_v3
View File

@ -75,6 +75,7 @@ function neutron_plugin_configure_dhcp_agent {
iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True
iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True
iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True
iniset $Q_DHCP_CONF_FILE DEFAULT ovs_integration_bridge $OVS_BRIDGE
} }
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {