From: Thomas Goirand Date: Fri, 18 Oct 2013 14:24:43 +0000 (+0800) Subject: Adds upstream fix for db setup (Closes: #726719). X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ab42cf6cb793e02fec390f8bb7580471eed0de80;p=openstack-build%2Fneutron-build.git Adds upstream fix for db setup (Closes: #726719). --- diff --git a/debian/changelog b/debian/changelog index 5f4dd1120..413ab5f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +neutron (2013.2-2) unstable; urgency=low + + * Adds upstream fix for db setup (Closes: #726719). + + -- Thomas Goirand Fri, 18 Oct 2013 22:24:05 +0800 + neutron (2013.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/Use_proper_argument_in_add_column_method_call.patch b/debian/patches/Use_proper_argument_in_add_column_method_call.patch new file mode 100644 index 000000000..fb9ccea43 --- /dev/null +++ b/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 +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/debian/patches/series b/debian/patches/series index 385c8b781..818e02076 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ better-config-default.patch +Use_proper_argument_in_add_column_method_call.patch