From e3cfbf1580d4e0b77191a2f4bcb61bde9f8d9815 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Mon, 4 Aug 2014 11:25:20 -0600 Subject: [PATCH] Don't set tunnel_types on VLAN network type The current code sets tunnel types for the neutron agent even when the network type is 'vlan'. This results in the agent not starting because 'vlan' is not a valid tunnel type. This patch changes it so tunnel_types is not populated when vlans are used. This bug just now surfaced because of commit 8feaf6c9516094df58df84479d73779e87a79264 requiring Q_ML2_TENANT_NETWORK_TYPE to be set to avoid being set to the 'local' type. Change-Id: If2bc57b36dad2bfb34df573581acce176604812e --- lib/neutron_plugins/ml2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2 index d2700156ee..42dd57f3d2 100644 --- a/lib/neutron_plugins/ml2 +++ b/lib/neutron_plugins/ml2 @@ -9,7 +9,7 @@ set +o xtrace # Select either 'gre', 'vxlan', or '(gre vxlan)' Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-"vxlan"} # This has to be set here since the agent will set this in the config file -if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; then +if [[ "$Q_ML2_TENANT_NETWORK_TYPE" == "gre" || "$Q_ML2_TENANT_NETWORK_TYPE" == "vxlan" ]]; then Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE) elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre)