--- 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'])