Merge "Ensure that DHCP agent is configured with correct bridge name"

This commit is contained in:
Jenkins 2015-09-18 21:40:53 +00:00 committed by Gerrit Code Review
commit 4b45478b25
3 changed files with 3 additions and 0 deletions

View File

@ -72,6 +72,7 @@ function neutron_plugin_configure_debug_command {
function neutron_plugin_configure_dhcp_agent {
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 ovs_integration_bridge $OVS_BRIDGE
}
function neutron_plugin_configure_l3_agent {

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_metadata_network 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 {

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_metadata_network 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 {