The existing ML2 code overwrote extra options set in localrc with
defualt values in some cases. This fixes it so it no longer does
that and instead adds to rather than overrides those values.
Fixes bug 1222854
Change-Id: Iafdaad7d4253f1b61e8a214c50adaf7599a641f2
... | ... |
@@ -10,9 +10,9 @@ set +o xtrace |
10 | 10 |
Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-} |
11 | 11 |
# This has to be set here since the agent will set this in the config file |
12 | 12 |
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then |
13 |
- Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE) |
|
13 |
+ Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE) |
|
14 | 14 |
elif [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then |
15 |
- Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=gre) |
|
15 |
+ Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre) |
|
16 | 16 |
fi |
17 | 17 |
|
18 | 18 |
# Default openvswitch L2 agent |
... | ... |
@@ -50,14 +50,14 @@ function neutron_plugin_configure_common() { |
50 | 50 |
|
51 | 51 |
function neutron_plugin_configure_service() { |
52 | 52 |
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then |
53 |
- Q_SRV_EXTRA_OPTS=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE) |
|
53 |
+ Q_SRV_EXTRA_OPTS+=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE) |
|
54 | 54 |
elif [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then |
55 | 55 |
# This assumes you want a simple configuration, and will overwrite |
56 | 56 |
# Q_SRV_EXTRA_OPTS if set in addition to ENABLE_TENANT_TUNNELS. |
57 |
- Q_SRV_EXTRA_OPTS=(tenant_network_types=gre) |
|
57 |
+ Q_SRV_EXTRA_OPTS+=(tenant_network_types=gre) |
|
58 | 58 |
Q_ML2_PLUGIN_GRE_TYPE_OPTIONS=(tunnel_id_ranges=$TENANT_TUNNEL_RANGES) |
59 | 59 |
elif [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then |
60 |
- Q_SRV_EXTRA_OPTS=(tenant_network_types=vlan) |
|
60 |
+ Q_SRV_EXTRA_OPTS+=(tenant_network_types=vlan) |
|
61 | 61 |
else |
62 | 62 |
echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts." |
63 | 63 |
fi |