From d16197b689e9087d6c22e0488c0aa671578a927d Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 28 Oct 2014 12:21:38 +0900 Subject: [PATCH] Stop setting deprecated OVS.enable_tunneling option The option has been deprecated in IceHouse and now being removed. Related-Bug: #1195374 Change-Id: I38d962551173892144c369df71e0524b43e1fc89 --- lib/neutron_plugins/ofagent_agent | 1 - lib/neutron_plugins/openvswitch | 5 ----- lib/neutron_plugins/openvswitch_agent | 1 - 3 files changed, 7 deletions(-) diff --git a/lib/neutron_plugins/ofagent_agent b/lib/neutron_plugins/ofagent_agent index 1c04f2f64e..55f3f72056 100644 --- a/lib/neutron_plugins/ofagent_agent +++ b/lib/neutron_plugins/ofagent_agent @@ -61,7 +61,6 @@ function neutron_plugin_configure_plugin_agent { if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ]; then die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." fi - iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP fi diff --git a/lib/neutron_plugins/openvswitch b/lib/neutron_plugins/openvswitch index e9bc5f9a78..3b6567cd0a 100644 --- a/lib/neutron_plugins/openvswitch +++ b/lib/neutron_plugins/openvswitch @@ -38,11 +38,6 @@ function neutron_plugin_configure_service { iniset /$Q_PLUGIN_CONF_FILE ovs network_vlan_ranges $OVS_VLAN_RANGES fi - # Enable tunnel networks if selected - if [[ $OVS_ENABLE_TUNNELING == "True" ]]; then - iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True - fi - _neutron_ovs_base_configure_firewall_driver # Define extra "OVS" configuration options when q-svc is configured by defining diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent index 835f645b8c..e1a6f4a47f 100644 --- a/lib/neutron_plugins/openvswitch_agent +++ b/lib/neutron_plugins/openvswitch_agent @@ -47,7 +47,6 @@ function neutron_plugin_configure_plugin_agent { if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ] && ! is_service_enabled q-svc ; then die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts." fi - iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP fi