Rebased patches.

Rewritten-From: fcbcc26c19b1eb84650f87691f93f3c963fb29a8

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 15a3e856370a10f1639e4b6eb96880864081d831..47d1d2a292fce2385812b5fa7ccd985c4cb7a21a 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -3,6 +3,7 @@ neutron (2014.2~b3-1) experimental; urgency=medium
   [ Thomas Goirand ]
   * Disabled ml2 config patch.
   * Fixed (build-)depends for this release.
+  * Rebased patches.
 
   [ gustavo panizzo ]
   * New upstream release.

diff --git a/trusty/debian/patches/0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch b/trusty/debian/patches/0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch
index b621a3c77018848452cf20abc652362bae96df57..5f7a3f1cc7dbdbab37e4cbc032eeacdf9f422213 100644 (file)
--- a/trusty/debian/patches/0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch
+++ b/trusty/debian/patches/0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch
@@ -19,8 +19,8 @@ Last-Update: 2014-06-30
 
 Index: neutron/etc/dhcp_agent.ini
 ===================================================================
---- neutron.orig/etc/dhcp_agent.ini    2014-07-18 10:32:38.000000000 +0800
-+++ neutron/etc/dhcp_agent.ini 2014-07-31 22:31:22.000000000 +0800
+--- neutron.orig/etc/dhcp_agent.ini    2014-09-19 18:00:01.000000000 +0800
++++ neutron/etc/dhcp_agent.ini 2014-09-19 18:10:15.000000000 +0800
 @@ -86,3 +86,8 @@
  # Timeout for ovs-vsctl commands.
  # If the timeout expires, ovs commands will fail with ALARMCLOCK error.
@@ -32,8 +32,8 @@ Index: neutron/etc/dhcp_agent.ini
 +# isolate_dns_requests = False
 Index: neutron/neutron/agent/linux/dhcp.py
 ===================================================================
---- neutron.orig/neutron/agent/linux/dhcp.py   2014-07-31 22:28:57.000000000 +0800
-+++ neutron/neutron/agent/linux/dhcp.py        2014-07-31 22:31:22.000000000 +0800
+--- neutron.orig/neutron/agent/linux/dhcp.py   2014-09-19 18:09:42.000000000 +0800
++++ neutron/neutron/agent/linux/dhcp.py        2014-09-19 18:10:15.000000000 +0800
 @@ -26,6 +26,7 @@
  import six
  
@@ -60,7 +60,7 @@ Index: neutron/neutron/agent/linux/dhcp.py
  
  
  class DictModel(dict):
-@@ -730,7 +735,67 @@
+@@ -775,7 +780,67 @@
              sock.close()
  
  
@@ -128,7 +128,7 @@ Index: neutron/neutron/agent/linux/dhcp.py
  
      def __init__(self, conf, root_helper, plugin):
          self.conf = conf
-@@ -879,6 +944,87 @@
+@@ -924,6 +989,87 @@
  
          return dhcp_port
  
@@ -216,7 +216,7 @@ Index: neutron/neutron/agent/linux/dhcp.py
      def setup(self, network):
          """Create and initialize a device for network's DHCP on this host."""
          port = self.setup_dhcp_port(network)
-@@ -917,6 +1063,9 @@
+@@ -962,6 +1108,9 @@
          if self.conf.use_namespaces:
              self._set_default_route(network, interface_name)
  
@@ -226,7 +226,7 @@ Index: neutron/neutron/agent/linux/dhcp.py
          return interface_name
  
      def update(self, network, device_name):
-@@ -924,9 +1073,17 @@
+@@ -969,9 +1118,17 @@
          if self.conf.use_namespaces:
              self._set_default_route(network, device_name)
  

diff --git a/trusty/debian/patches/better-config-default.patch b/trusty/debian/patches/better-config-default.patch
index 777623f69709a6b1c89cf00291baa956420f8ea7..b395a1857320328e710a47009fce0e81f4b92a20 100644 (file)
--- a/trusty/debian/patches/better-config-default.patch
+++ b/trusty/debian/patches/better-config-default.patch
@@ -29,8 +29,10 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
---- neutron-2014.2~b2.orig/etc/l3_agent.ini
-+++ neutron-2014.2~b2/etc/l3_agent.ini
+Index: neutron/etc/l3_agent.ini
+===================================================================
+--- neutron.orig/etc/l3_agent.ini      2014-09-19 18:09:42.000000000 +0800
++++ neutron/etc/l3_agent.ini   2014-09-19 18:10:35.000000000 +0800
 @@ -4,11 +4,10 @@
  
  # L3 requires that an interface driver be set. Choose the one that best
@@ -44,9 +46,11 @@ Last-Update: <YYYY-MM-DD>
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2014.2~b2.orig/etc/neutron.conf
-+++ neutron-2014.2~b2/etc/neutron.conf
-@@ -60,8 +60,8 @@ lock_path = $state_path/lock
+Index: neutron/etc/neutron.conf
+===================================================================
+--- neutron.orig/etc/neutron.conf      2014-09-19 18:09:42.000000000 +0800
++++ neutron/etc/neutron.conf   2014-09-19 18:10:35.000000000 +0800
+@@ -60,8 +60,8 @@
  # previous versions, the class name of a plugin can be specified instead of its
  # entrypoint name.
  #
@@ -56,7 +60,7 @@ Last-Update: <YYYY-MM-DD>
  
  # (ListOpt) List of service plugin entrypoints to be loaded from the
  # neutron.service_plugins namespace. See setup.cfg for the entrypoint names of
-@@ -69,8 +69,8 @@ lock_path = $state_path/lock
+@@ -69,8 +69,8 @@
  # with previous versions, the class name of a plugin can be specified instead
  # of its entrypoint name.
  #
@@ -66,7 +70,7 @@ Last-Update: <YYYY-MM-DD>
  
  # Paste configuration file
  # api_paste_config = api-paste.ini
-@@ -315,7 +315,7 @@ lock_path = $state_path/lock
+@@ -324,7 +324,7 @@
  
  # The RabbitMQ broker address where a single node is used.
  # (string value)
@@ -75,7 +79,7 @@ Last-Update: <YYYY-MM-DD>
  
  # The RabbitMQ broker port where a single node is used.
  # (integer value)
-@@ -328,10 +328,10 @@ lock_path = $state_path/lock
+@@ -337,10 +337,10 @@
  #rabbit_use_ssl=false
  
  # The RabbitMQ userid. (string value)
@@ -88,7 +92,7 @@ Last-Update: <YYYY-MM-DD>
  
  # the RabbitMQ login method (string value)
  #rabbit_login_method=AMQPLAIN
-@@ -507,7 +507,7 @@ lock_path = $state_path/lock
+@@ -527,7 +527,7 @@
  # 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
@@ -97,7 +101,7 @@ Last-Update: <YYYY-MM-DD>
  
  # =========== items for agent management extension =============
  # seconds between nodes reporting state to server; should be less than
-@@ -527,14 +527,13 @@ admin_password = %SERVICE_PASSWORD%
+@@ -547,14 +547,13 @@
  [database]
  # This line MUST be changed to actually run the plugin.
  # Example:
@@ -113,8 +117,10 @@ Last-Update: <YYYY-MM-DD>
  
  # Database engine for which script will be generated when using offline
  # migration
---- neutron-2014.2~b2.orig/etc/lbaas_agent.ini
-+++ neutron-2014.2~b2/etc/lbaas_agent.ini
+Index: neutron/etc/lbaas_agent.ini
+===================================================================
+--- neutron.orig/etc/lbaas_agent.ini   2014-09-19 18:00:25.000000000 +0800
++++ neutron/etc/lbaas_agent.ini        2014-09-19 18:10:35.000000000 +0800
 @@ -9,11 +9,10 @@
  
  # LBaas requires an interface driver be set. Choose the one that best
@@ -128,8 +134,10 @@ Last-Update: <YYYY-MM-DD>
  
  # Use veth for an OVS interface or not.
  # Support kernels with limited namespace support
---- neutron-2014.2~b2.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
-+++ neutron-2014.2~b2/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+Index: neutron/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+===================================================================
+--- neutron.orig/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini        2014-09-19 18:00:25.000000000 +0800
++++ neutron/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini     2014-09-19 18:10:35.000000000 +0800
 @@ -30,22 +30,22 @@
  #          point setting tunnel_type below will be required to enable
  #          tunneling.

diff --git a/trusty/debian/patches/fix-alembic-migration-with-sqlite3.patch b/trusty/debian/patches/fix-alembic-migration-with-sqlite3.patch
index e24c32f9c6bacdb73c770967f27861e8bb6960a5..b8f178e8bc796c70efa29781366e084d61261bae 100644 (file)
--- a/trusty/debian/patches/fix-alembic-migration-with-sqlite3.patch
+++ b/trusty/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: 2014-07-31
 
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
-@@ -41,8 +41,48 @@ from neutron.db import migration
+Index: neutron/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py
+===================================================================
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py   2014-09-19 18:00:25.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/35c7c198ddea_lbaas_healthmon_del_status.py        2014-09-19 18:10:26.000000000 +0800
+@@ -41,8 +41,48 @@
  def upgrade(active_plugins=None, options=None):
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
@@ -61,9 +63,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
-@@ -53,19 +53,63 @@ def upgrade(active_plugins=None, options
+Index: neutron/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py
+===================================================================
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py      2014-09-19 18:09:42.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/50d5ba354c23_ml2_binding_vif_details.py   2014-09-19 18:10:26.000000000 +0800
+@@ -53,19 +53,63 @@
              "UPDATE ml2_port_bindings SET"
              " vif_details = '{\"port_filter\": false}'"
              " WHERE cap_port_filter = 0")
@@ -135,10 +139,12 @@ Last-Update: 2014-07-31
 +
  
  def downgrade(active_plugins=None, options=None):
-     if not migration.should_run(active_plugins, migration_for_plugins):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py
-@@ -59,7 +59,7 @@ def upgrade(active_plugins=None, options
+     pass
+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-09-19 18:00:25.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/128e042a2b68_ext_gw_mode.py       2014-09-19 18:10:26.000000000 +0800
+@@ -59,7 +59,7 @@
      op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
                                         nullable=False, server_default="1"))
      # Set enable_snat to True for existing routers
@@ -147,9 +153,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py
-@@ -44,11 +44,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-09-19 18:00:25.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/63afba73813_ovs_tunnelendpoints_id_unique.py      2014-09-19 18:10:26.000000000 +0800
+@@ -44,11 +44,27 @@
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
  
@@ -182,9 +190,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
-@@ -45,11 +45,17 @@ def upgrade(active_plugins=None, options
+Index: neutron/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py
+===================================================================
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py  2014-09-19 18:09:42.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/e197124d4b9_add_unique_constrain.py       2014-09-19 18:10:26.000000000 +0800
+@@ -45,11 +45,17 @@
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
  
@@ -207,9 +217,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
-@@ -41,14 +41,19 @@ def upgrade(active_plugins=None, options
+Index: neutron/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py
+===================================================================
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py        2014-09-19 18:09:42.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/abc88c33f74f_lb_stats_needs_bigint.py     2014-09-19 18:10:26.000000000 +0800
+@@ -41,14 +41,19 @@
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
  
@@ -237,9 +249,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
-@@ -53,11 +53,17 @@ def upgrade(active_plugins=None, options
+Index: neutron/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py
+===================================================================
+--- neutron.orig/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py       2014-09-19 18:09:42.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/1fcfc149aca4_agents_unique_by_type_and_host.py    2014-09-19 18:10:26.000000000 +0800
+@@ -54,11 +54,17 @@
      if not migration.should_run(active_plugins, migration_for_plugins):
          return
  
@@ -262,9 +276,11 @@ Last-Update: 2014-07-31
  
  
  def downgrade(active_plugins=None, options=None):
---- neutron-2014.2~b2.orig/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
-+++ neutron-2014.2~b2/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py
-@@ -36,7 +36,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-09-19 18:00:25.000000000 +0800
++++ neutron/neutron/db/migration/alembic_migrations/versions/f9263d6df56_remove_dhcp_lease.py  2014-09-19 18:10:26.000000000 +0800
+@@ -36,7 +36,42 @@
  
  
  def upgrade(active_plugins=None, options=None):