Adds upstream fix for db setup (Closes: #726719).

Rewritten-From: ab42cf6cb793e02fec390f8bb7580471eed0de80

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 5f4dd112005457228f276f3fcdedc6513db3c3e6..413ab5f9fd58c857cfd7ec382013699ca6864ee5 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+neutron (2013.2-2) unstable; urgency=low
+
+  * Adds upstream fix for db setup (Closes: #726719).
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 18 Oct 2013 22:24:05 +0800
+
 neutron (2013.2-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/trusty/debian/patches/Use_proper_argument_in_add_column_method_call.patch b/trusty/debian/patches/Use_proper_argument_in_add_column_method_call.patch
new file mode 100644 (file)
index 0000000..fb9ccea
--- /dev/null
+++ b/trusty/debian/patches/Use_proper_argument_in_add_column_method_call.patch
@@ -0,0 +1,18 @@
+Description: Use proper argument in add_column method call
+Author: Eugene Nikanorov <enikanorov@mirantis.com>
+Origin: upstream, https://review.openstack.org/#/c/52636/
+Bug-Debian: http://bugs.debian.org/726719
+Bug-Ubuntu: https://launchpad.net/bugs/1241577
+Last-Update: Fri, 18 Oct 2013 21:50:42 +0800 (17:50 +0400)
+
+--- 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,7 +52,7 @@ def upgrade(active_plugins=None, options
+         return
+ 
+     op.add_column('routers', sa.Column('enable_snat', sa.Boolean(),
+-                                       nullable=False, default=True))
++                                       nullable=False, server_default=True))
+     # Set enable_snat to True for existing routers
+     op.execute("UPDATE routers SET enable_snat=True")
+ 

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 385c8b78109cfc57c67fa73447bbd44e6398e443..818e020767f0f0d886b5bb352a81ceb08db7e79f 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1 +1,2 @@
 better-config-default.patch
+Use_proper_argument_in_add_column_method_call.patch