openstack/devstack
Code Issues Proposed changes

Merge "Add a Tunnel end-point variable for Neutron configuration"

Browse Source
This commit is contained in:
Jenkins 2014-07-15 18:29:58 +00:00 committed by Gerrit Code Review
commit faa46f0014
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/neutron
View File

@ -203,6 +203,13 @@ OVS_PHYSICAL_BRIDGE=${OVS_PHYSICAL_BRIDGE:-}
# Example: ``LB_PHYSICAL_INTERFACE=eth1`` # Example: ``LB_PHYSICAL_INTERFACE=eth1``
LB_PHYSICAL_INTERFACE=${LB_PHYSICAL_INTERFACE:-} LB_PHYSICAL_INTERFACE=${LB_PHYSICAL_INTERFACE:-}
# When Neutron tunnels are enabled it is needed to specify the
# IP address of the end point in the local server. This IP is set
# by default to the same IP address that the HOST IP.
# This variable can be used to specify a different end point IP address
# Example: ``TUNNEL_ENDPOINT_IP=1.1.1.1``
TUNNEL_ENDPOINT_IP=${TUNNEL_ENDPOINT_IP:-$HOST_IP}
# With the openvswitch plugin, set to True in ``localrc`` to enable # With the openvswitch plugin, set to True in ``localrc`` to enable
# provider GRE tunnels when ``ENABLE_TENANT_TUNNELS`` is False. # provider GRE tunnels when ``ENABLE_TENANT_TUNNELS`` is False.
# #

2
lib/neutron_plugins/ml2
View File

@ -99,7 +99,7 @@ function neutron_plugin_configure_service {
fi fi
# Since we enable the tunnel TypeDrivers, also enable a local_ip # Since we enable the tunnel TypeDrivers, also enable a local_ip
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS

2
lib/neutron_plugins/ofagent_agent
View File

@ -54,7 +54,7 @@ function neutron_plugin_configure_plugin_agent {
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
fi fi
iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
fi fi
# Setup physical network bridge mappings. Override # Setup physical network bridge mappings. Override

2
lib/neutron_plugins/openvswitch_agent
View File

@ -48,7 +48,7 @@ function neutron_plugin_configure_plugin_agent {
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
fi fi
iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
fi fi
# Setup physical network bridge mappings. Override # Setup physical network bridge mappings. Override