From 5a3243851bc70a3160899c26d59b0d9500f8e744 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 9 Dec 2013 23:47:58 +0800 Subject: [PATCH] Refresh better-config-default.patch Change-Id: Ic69d2b234c1d7dc512e283c1ef4c02dd5e105854 --- debian/patches/better-config-default.patch | 55 ++++++++++--------- .../configure_service_plugin_by_default.patch | 17 ------ .../fixes-SQLAlchemy-requirement.patch | 14 +++-- debian/patches/series | 3 +- neutron/plugins/ml2/plugin.py | 1 - neutron/tests/unit/midonet/mock_lib.py | 3 - 6 files changed, 39 insertions(+), 54 deletions(-) delete mode 100644 debian/patches/configure_service_plugin_by_default.patch diff --git a/debian/patches/better-config-default.patch b/debian/patches/better-config-default.patch index c8da9c8ac..cb8618ca1 100644 --- a/debian/patches/better-config-default.patch +++ b/debian/patches/better-config-default.patch @@ -3,12 +3,16 @@ Description: Better config default parse with maintainer scripts. This patch fixes that. Author: Thomas Goirand Forwarded: no -Last-Update: 2013-11-27 +Last-Update: 2013-12-09 ---- neutron-2013.2.orig/etc/l3_agent.ini -+++ neutron-2013.2/etc/l3_agent.ini -@@ -8,7 +8,7 @@ +--- neutron-2014.1~b1.orig/etc/l3_agent.ini ++++ neutron-2014.1~b1/etc/l3_agent.ini +@@ -4,11 +4,9 @@ + # L3 requires that an interface driver be set. Choose the one that best + # matches your plugin. +-# interface_driver = +- # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC) # that supports L3 agent -# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver @@ -16,9 +20,9 @@ Last-Update: 2013-11-27 # Use veth for an OVS interface or not. # Support kernels with limited namespace support ---- neutron-2013.2.orig/etc/neutron.conf -+++ neutron-2013.2/etc/neutron.conf -@@ -45,7 +45,7 @@ lock_path = $state_path/lock +--- neutron-2014.1~b1.orig/etc/neutron.conf ++++ neutron-2014.1~b1/etc/neutron.conf +@@ -45,10 +45,10 @@ lock_path = $state_path/lock # api_extensions_path = # Neutron plugin provider module @@ -26,7 +30,11 @@ Last-Update: 2013-11-27 +core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 # Advanced service modules - # service_plugins = +-# service_plugins = ++service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin + + # Paste configuration file + # api_paste_config = api-paste.ini @@ -119,16 +119,16 @@ lock_path = $state_path/lock # SSL certification authority file (valid only if SSL enabled)' # kombu_ssl_ca_certs = @@ -47,7 +55,7 @@ Last-Update: 2013-11-27 # Location of a virtual RabbitMQ installation. # rabbit_virtual_host = / # Maximum retries with trying to connect to RabbitMQ -@@ -294,7 +294,7 @@ notification_driver = neutron.openstack. +@@ -299,7 +299,7 @@ notification_driver = neutron.openstack. # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the comand directly @@ -55,8 +63,8 @@ Last-Update: 2013-11-27 +root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf # =========== items for agent management extension ============= - # seconds between nodes reporting state to server, should be less than -@@ -314,11 +314,10 @@ signing_dir = $state_path/keystone-signi + # seconds between nodes reporting state to server; should be less than +@@ -319,11 +319,10 @@ signing_dir = $state_path/keystone-signi [database] # This line MUST be changed to actually run the plugin. @@ -70,9 +78,13 @@ Last-Update: 2013-11-27 # The SQLAlchemy connection string used to connect to the slave database # slave_connection = ---- neutron-2013.2.orig/etc/lbaas_agent.ini -+++ neutron-2013.2/etc/lbaas_agent.ini -@@ -13,7 +13,7 @@ +--- neutron-2014.1~b1.orig/etc/lbaas_agent.ini ++++ neutron-2014.1~b1/etc/lbaas_agent.ini +@@ -9,11 +9,10 @@ + + # LBaas requires an interface driver be set. Choose the one that best + # matches your plugin. +-# interface_driver = # Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP, # BigSwitch/Floodlight) @@ -81,14 +93,14 @@ Last-Update: 2013-11-27 # Use veth for an OVS interface or not. # Support kernels with limited namespace support ---- neutron-2013.2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini -+++ neutron-2013.2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +--- neutron-2014.1~b1.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini ++++ neutron-2014.1~b1/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini @@ -30,7 +30,7 @@ # point setting tunnel_type below will be required to enable # tunneling. # -# enable_tunneling = False -+enable_tunneling = False ++enable_tunneling = True # (StrOpt) The type of tunnel network, if any, supported by the plugin. If # this is set, it will cause tunneling to be enabled. If this is not set and @@ -111,7 +123,7 @@ Last-Update: 2013-11-27 # (ListOpt) Comma-separated list of : tuples # mapping physical network names to the agent's node-specific OVS -@@ -123,30 +123,5 @@ +@@ -130,24 +130,4 @@ [securitygroup] # Firewall driver for realizing neutron security group function. @@ -123,24 +135,17 @@ Last-Update: 2013-11-27 -#----------------------------------------------------------------------------- -# -# 1. With VLANs on eth1. --# [database] --# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron -# [OVS] -# network_vlan_ranges = default:2000:3999 -# tunnel_id_ranges = -# integration_bridge = br-int -# bridge_mappings = default:br-eth1 --# [AGENT] --# Add the following setting, if you want to log to a file -# -# 2. With tunneling. --# [database] --# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron -# [OVS] -# network_vlan_ranges = -# tunnel_id_ranges = 1:1000 -# integration_bridge = br-int -# tunnel_bridge = br-tun -# local_ip = 10.0.0.3 -+# Example: firewall_driver = neutron.agent.firewall.NoopFirewallDriver +firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver diff --git a/debian/patches/configure_service_plugin_by_default.patch b/debian/patches/configure_service_plugin_by_default.patch deleted file mode 100644 index ffdafce42..000000000 --- a/debian/patches/configure_service_plugin_by_default.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Configure service_plugin by default - service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin -Author: Thomas Goirand -Forwarded: not-needed -Last-Update: 2013-12-05 - ---- neutron-2013.2.orig/etc/neutron.conf -+++ neutron-2013.2/etc/neutron.conf -@@ -48,7 +48,7 @@ lock_path = $state_path/lock - core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2 - - # Advanced service modules --# service_plugins = -+service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin - - # Paste configuration file - # api_paste_config = api-paste.ini diff --git a/debian/patches/fixes-SQLAlchemy-requirement.patch b/debian/patches/fixes-SQLAlchemy-requirement.patch index e4f4e3cb8..18423e2a9 100644 --- a/debian/patches/fixes-SQLAlchemy-requirement.patch +++ b/debian/patches/fixes-SQLAlchemy-requirement.patch @@ -5,14 +5,16 @@ Author: Thomas Goirand Forwarded: no Last-Update: 2013-12-02 ---- neutron-2013.2.orig/requirements.txt -+++ neutron-2013.2/requirements.txt -@@ -17,7 +17,7 @@ Jinja2 - kombu>=2.4.8 - netaddr +Index: neutron/requirements.txt +=================================================================== +--- neutron.orig/requirements.txt 2013-12-09 23:29:38.000000000 +0800 ++++ neutron/requirements.txt 2013-12-09 23:48:24.000000000 +0800 +@@ -18,7 +18,7 @@ + netaddr>=0.7.6 + psutil>=0.6.1,<1.0 python-neutronclient>=2.3.0,<3 -SQLAlchemy>=0.7.8,<=0.7.99 +SQLAlchemy>=0.7.8 WebOb>=1.2.3,<1.3 - python-keystoneclient>=0.3.2 + python-keystoneclient>=0.4.1 alembic>=0.4.1 diff --git a/debian/patches/series b/debian/patches/series index 42575eb9a..ff05010bb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ fix-alembic-migration-with-sqlite3.patch -better-config-default.patch fixes-SQLAlchemy-requirement.patch -configure_service_plugin_by_default.patch +better-config-default.patch diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 8b60a63ee..036893040 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -379,7 +379,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, LOG.debug(_("Deleting network %s"), id) session = context.session - filter = {'network_id': [id]} while True: try: with session.begin(subtransactions=True): diff --git a/neutron/tests/unit/midonet/mock_lib.py b/neutron/tests/unit/midonet/mock_lib.py index b3dbfc745..9fdae9cd6 100644 --- a/neutron/tests/unit/midonet/mock_lib.py +++ b/neutron/tests/unit/midonet/mock_lib.py @@ -134,9 +134,6 @@ class MidonetLibMockConfig(): def _create_router(self, **kwargs): return get_router_mock(**kwargs) - def _create_router(self, tenant_id, name): - return get_router_mock(tenant_id=tenant_id, name=name) - def _create_subnet(self, bridge, gateway_ip, subnet_prefix, subnet_len): return get_subnet_mock(bridge.get_id(), gateway_ip=gateway_ip, subnet_prefix=subnet_prefix, -- 2.45.2