--- a/components/openstack/neutron/files/neutron-upgrade	Tue Apr 26 23:36:26 2016 -0400
+++ b/components/openstack/neutron/files/neutron-upgrade	Wed Apr 27 16:15:18 2016 -0700
@@ -104,6 +104,8 @@
         engine = sqlalchemy.create_engine(db_connection)
         if engine.url.username != '%SERVICE_USER%':
             check_call(['/usr/bin/neutron-db-manage', '--config-file',
+                        '/etc/neutron/neutron.conf', 'stamp', 'havana'])
+            check_call(['/usr/bin/neutron-db-manage', '--config-file',
                         '/etc/neutron/neutron.conf', 'upgrade', 'juno'])
             check_call(['/usr/bin/neutron-db-manage', '--config-file',
                         '/etc/neutron/neutron.conf', 'upgrade', 'kilo'])

--- a/components/openstack/neutron/patches/05-alembic-migrations.patch	Tue Apr 26 23:36:26 2016 -0400
+++ b/components/openstack/neutron/patches/05-alembic-migrations.patch	Wed Apr 27 16:15:18 2016 -0700
@@ -193,7 +193,7 @@
 +    insp = sa.engine.reflection.Inspector.from_engine(bind)
 +    col_names_list = insp.get_columns('floatingips')
 +    col_names = []
-+    for c in col_name_list:
++    for c in col_names_list:
 +        col_names.append(c['name'])
 +
 +    if 'last_known_router_id' not in col_names: