# HG changeset patch
# User Padma Dakoju <padma.dakoju@oracle.com>
# Date 1462294440 25200
# Node ID e91f569899b840e08ebe6e5ae64c27f0ec6757a4
# Parent  14224167e318741ac9e21e48a5f01c5b013bfa47
23205460 Fix for 23192887 breaks Juno to Kilo upgrade with instances and floating IPs

diff -r 14224167e318 -r e91f569899b8 components/openstack/neutron/patches/05-alembic-migrations.patch
--- a/components/openstack/neutron/patches/05-alembic-migrations.patch	Wed Apr 27 09:15:20 2016 -0700
+++ b/components/openstack/neutron/patches/05-alembic-migrations.patch	Tue May 03 09:54:00 2016 -0700
@@ -1,3 +1,7 @@
+In-house patch to skip over unnecessary database migrations for Neutron.
+Juno database tables for Neutron do not need these migrations when upgrading
+to Kilo.
+
 --- neutron-2015.1.2/neutron/db/migration/alembic_migrations/agent_init_ops.py.orig	2016-04-22 23:23:15.523526779 -0700
 +++ neutron-2015.1.2/neutron/db/migration/alembic_migrations/agent_init_ops.py	2016-04-22 23:25:39.337181119 -0700
 @@ -23,7 +23,10 @@
@@ -250,3 +254,13 @@
          'routerports',
          sa.Column('router_id', sa.String(length=36), nullable=False),
          sa.Column('port_id', sa.String(length=36), nullable=False),
+@@ -59,6 +59,6 @@
+             ['ports.id'],
+             ondelete='CASCADE'
+         ),
+-    )
++        )
+
+-    op.execute(SQL_STATEMENT)
++        op.execute(SQL_STATEMENT)
+