From 4455ad0fe76d231cff2f3bfc4d94ec9a03187d30 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 13 Mar 2014 15:08:01 +0800 Subject: [PATCH] Refresh patches. Change-Id: I8c18e75a306fbc42f84297d1182069acf5965bf0 --- debian/patches/better-config-default.patch | 37 ++++++++++--------- .../fix-alembic-migration-with-sqlite3.patch | 24 +++++++----- .../fixes-SQLAlchemy-requirement.patch | 26 ++++++------- debian/patches/series | 2 +- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/debian/patches/better-config-default.patch b/debian/patches/better-config-default.patch index 51a4d7cab..f4fb47396 100644 --- a/debian/patches/better-config-default.patch +++ b/debian/patches/better-config-default.patch @@ -3,10 +3,10 @@ Description: Better config default parse with maintainer scripts. This patch fixes that. Author: Thomas Goirand Forwarded: no -Last-Update: 2013-12-09 +Last-Update: 2014-03-13 ---- neutron-2014.1~b2.orig/etc/l3_agent.ini -+++ neutron-2014.1~b2/etc/l3_agent.ini +--- neutron-2014.1~b3.orig/etc/l3_agent.ini ++++ neutron-2014.1~b3/etc/l3_agent.ini @@ -4,11 +4,9 @@ # L3 requires that an interface driver be set. Choose the one that best @@ -20,8 +20,8 @@ Last-Update: 2013-12-09 # Use veth for an OVS interface or not. # Support kernels with limited namespace support ---- neutron-2014.1~b2.orig/etc/neutron.conf -+++ neutron-2014.1~b2/etc/neutron.conf +--- neutron-2014.1~b3.orig/etc/neutron.conf ++++ neutron-2014.1~b3/etc/neutron.conf @@ -50,8 +50,7 @@ lock_path = $state_path/lock # previous versions, the class name of a plugin can be specified instead of its # entrypoint name. @@ -43,7 +43,7 @@ Last-Update: 2013-12-09 # Paste configuration file # api_paste_config = api-paste.ini @@ -131,16 +130,16 @@ lock_path = $state_path/lock - # SSL certification authority file (valid only if SSL enabled)' + # SSL certification authority file (valid only if SSL enabled) # kombu_ssl_ca_certs = # IP address of the RabbitMQ installation -# rabbit_host = localhost @@ -62,7 +62,7 @@ Last-Update: 2013-12-09 # Location of a virtual RabbitMQ installation. # rabbit_virtual_host = / # Maximum retries with trying to connect to RabbitMQ -@@ -320,7 +319,7 @@ notification_driver = neutron.openstack. +@@ -348,7 +347,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 @@ -71,7 +71,7 @@ Last-Update: 2013-12-09 # =========== items for agent management extension ============= # seconds between nodes reporting state to server; should be less than -@@ -340,11 +339,10 @@ signing_dir = $state_path/keystone-signi +@@ -368,11 +367,10 @@ signing_dir = $state_path/keystone-signi [database] # This line MUST be changed to actually run the plugin. @@ -85,8 +85,8 @@ Last-Update: 2013-12-09 # The SQLAlchemy connection string used to connect to the slave database # slave_connection = ---- neutron-2014.1~b2.orig/etc/lbaas_agent.ini -+++ neutron-2014.1~b2/etc/lbaas_agent.ini +--- neutron-2014.1~b3.orig/etc/lbaas_agent.ini ++++ neutron-2014.1~b3/etc/lbaas_agent.ini @@ -9,11 +9,10 @@ # LBaas requires an interface driver be set. Choose the one that best @@ -100,8 +100,8 @@ Last-Update: 2013-12-09 # Use veth for an OVS interface or not. # Support kernels with limited namespace support ---- neutron-2014.1~b2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini -+++ neutron-2014.1~b2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +--- neutron-2014.1~b3.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini ++++ neutron-2014.1~b3/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini @@ -30,7 +30,7 @@ # point setting tunnel_type below will be required to enable # tunneling. @@ -130,10 +130,11 @@ Last-Update: 2013-12-09 # (ListOpt) Comma-separated list of : tuples # mapping physical network names to the agent's node-specific OVS -@@ -131,35 +131,4 @@ +@@ -130,36 +130,4 @@ + [securitygroup] # Firewall driver for realizing neutron security group function. - # firewall_driver = neutron.agent.firewall.NoopFirewallDriver +-# firewall_driver = neutron.agent.firewall.NoopFirewallDriver -# Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver - -#----------------------------------------------------------------------------- @@ -141,14 +142,14 @@ Last-Update: 2013-12-09 -#----------------------------------------------------------------------------- -# -# 1. With VLANs on eth1. --# [OVS] +-# [ovs] -# network_vlan_ranges = default:2000:3999 -# tunnel_id_ranges = -# integration_bridge = br-int -# bridge_mappings = default:br-eth1 -# -# 2. With GRE tunneling. --# [OVS] +-# [ovs] -# network_vlan_ranges = -# tunnel_id_ranges = 1:1000 -# integration_bridge = br-int @@ -156,7 +157,7 @@ Last-Update: 2013-12-09 -# local_ip = 10.0.0.3 -# -# 3. With VXLAN tunneling. --# [OVS] +-# [ovs] -# network_vlan_ranges = -# tenant_network_type = vxlan -# tunnel_type = vxlan @@ -164,6 +165,6 @@ Last-Update: 2013-12-09 -# integration_bridge = br-int -# tunnel_bridge = br-tun -# local_ip = 10.0.0.3 --# [AGENT] +-# [agent] -# tunnel_types = vxlan +firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver diff --git a/debian/patches/fix-alembic-migration-with-sqlite3.patch b/debian/patches/fix-alembic-migration-with-sqlite3.patch index 9108b45aa..58df40dbe 100644 --- a/debian/patches/fix-alembic-migration-with-sqlite3.patch +++ b/debian/patches/fix-alembic-migration-with-sqlite3.patch @@ -8,9 +8,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/1241952 Forwarded: https://review.openstack.org/#/c/52636 Last-Update: 2013-10-22 ---- neutron-2013.2.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py -+++ neutron-2013.2/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py -@@ -52,9 +52,9 @@ def upgrade(active_plugins=None, options +Index: neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py +=================================================================== +--- neutron.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py 2014-03-13 15:06:43.000000000 +0800 ++++ neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py 2014-03-13 15:07:13.000000000 +0800 +@@ -56,9 +56,9 @@ return op.add_column('routers', sa.Column('enable_snat', sa.Boolean(), @@ -22,9 +24,11 @@ Last-Update: 2013-10-22 def downgrade(active_plugins=None, options=None): ---- neutron-2013.2.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py -+++ neutron-2013.2/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py -@@ -46,11 +46,27 @@ def upgrade(active_plugins=None, options +Index: neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py +=================================================================== +--- neutron.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py 2014-03-13 14:49:49.000000000 +0800 ++++ neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py 2014-03-13 15:07:13.000000000 +0800 +@@ -46,11 +46,27 @@ if not migration.should_run(active_plugins, migration_for_plugins): return @@ -57,9 +61,11 @@ Last-Update: 2013-10-22 def downgrade(active_plugins=None, options=None): ---- neutron-2013.2.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py -+++ neutron-2013.2/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py -@@ -38,7 +38,42 @@ import sqlalchemy as sa +Index: neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py +=================================================================== +--- neutron.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py 2014-03-13 14:49:49.000000000 +0800 ++++ neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py 2014-03-13 15:07:13.000000000 +0800 +@@ -38,7 +38,42 @@ def upgrade(active_plugins=None, options=None): diff --git a/debian/patches/fixes-SQLAlchemy-requirement.patch b/debian/patches/fixes-SQLAlchemy-requirement.patch index 18423e2a9..4746c714c 100644 --- a/debian/patches/fixes-SQLAlchemy-requirement.patch +++ b/debian/patches/fixes-SQLAlchemy-requirement.patch @@ -1,20 +1,16 @@ -Description: Fixes the sqlalchemy requirement - Upstream wrongly restricts SQLAlchemy dependency, while 0.8 is perfectly - fine with Neutron. +Description: Fix SQLA requirement Author: Thomas Goirand -Forwarded: no -Last-Update: 2013-12-02 +Forwarded: not-needed +Last-Update: 2014-03-13 -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 @@ +--- neutron-2014.1~b3.orig/requirements.txt ++++ neutron-2014.1~b3/requirements.txt +@@ -17,7 +17,7 @@ Jinja2 + kombu>=2.4.8 netaddr>=0.7.6 - psutil>=0.6.1,<1.0 - python-neutronclient>=2.3.0,<3 --SQLAlchemy>=0.7.8,<=0.7.99 + python-neutronclient>=2.3.4,<3 +-SQLAlchemy>=0.7.8,<=0.8.99 +SQLAlchemy>=0.7.8 - WebOb>=1.2.3,<1.3 - python-keystoneclient>=0.4.1 + WebOb>=1.2.3 + python-keystoneclient>=0.6.0 alembic>=0.4.1 diff --git a/debian/patches/series b/debian/patches/series index ff05010bb..218bbf4f9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ fix-alembic-migration-with-sqlite3.patch -fixes-SQLAlchemy-requirement.patch better-config-default.patch +fixes-SQLAlchemy-requirement.patch -- 2.45.2