Browse code
Stop setting deprecated OVS.enable_tunneling option
The option has been deprecated in IceHouse and now being removed.
Related-Bug: #1195374
Change-Id: I38d962551173892144c369df71e0524b43e1fc89
YAMAMOTO Takashi authored on 2014/10/28 12:21:38Showing 3 changed files
- lib/neutron_plugins/ofagent_agent
- lib/neutron_plugins/openvswitch
- lib/neutron_plugins/openvswitch_agent
| ... | ... |
@@ -61,7 +61,6 @@ function neutron_plugin_configure_plugin_agent {
|
| 61 | 61 |
if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ]; then |
| 62 | 62 |
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." |
| 63 | 63 |
fi |
| 64 |
- iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True |
|
| 65 | 64 |
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP |
| 66 | 65 |
fi |
| 67 | 66 |
|
| ... | ... |
@@ -38,11 +38,6 @@ function neutron_plugin_configure_service {
|
| 38 | 38 |
iniset /$Q_PLUGIN_CONF_FILE ovs network_vlan_ranges $OVS_VLAN_RANGES |
| 39 | 39 |
fi |
| 40 | 40 |
|
| 41 |
- # Enable tunnel networks if selected |
|
| 42 |
- if [[ $OVS_ENABLE_TUNNELING == "True" ]]; then |
|
| 43 |
- iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True |
|
| 44 |
- fi |
|
| 45 |
- |
|
| 46 | 41 |
_neutron_ovs_base_configure_firewall_driver |
| 47 | 42 |
|
| 48 | 43 |
# Define extra "OVS" configuration options when q-svc is configured by defining |
| ... | ... |
@@ -47,7 +47,6 @@ function neutron_plugin_configure_plugin_agent {
|
| 47 | 47 |
if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ] && ! is_service_enabled q-svc ; then |
| 48 | 48 |
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." |
| 49 | 49 |
fi |
| 50 |
- iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True |
|
| 51 | 50 |
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP |
| 52 | 51 |
fi |
| 53 | 52 |
|