Back off initial migration to 35

Upgrading from the Havana release to Juno is failing because the
initial Juno migration doesn't include a couple of migrations that
weren't in the initial Havana release but were added afterwards.

This change adds the 036 migration from Havana back in and moves
the initial Juno migration back to 035.

Change-Id: I1045696d66d7a63587aaaf70230a5eaf46e7d65d
Partial-Bug: #1357498

keystone/common/sql/migrate_repo/__init__.py

@@ -14,4 +14,4 @@
 # under the License.
 
 
-DB_INIT_VERSION = 35
+DB_INIT_VERSION = 34

keystone/common/sql/migrate_repo/versions/035_havana.py

@@ -231,6 +231,7 @@ def upgrade(migrate_engine):
     sql.Index('ix_token_expires', token.c.expires).create()
     sql.Index('ix_token_expires_valid', token.c.expires,
               token.c.valid).create()
+    sql.Index('ix_token_valid', token.c.valid).create()
 
     fkeys = [
         {'columns': [user_project_metadata.c.project_id],

keystone/common/sql/migrate_repo/versions/036_token_drop_valid_index.py

@@ -0,0 +1,31 @@
+# Copyright 2013 Hewlett-Packard Development Company, L.P.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import sqlalchemy as sql
+
+
+def upgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    token = sql.Table('token', meta, autoload=True)
+    idx = sql.Index('ix_token_valid', token.c.valid)
+    idx.drop(migrate_engine)
+
+
+def downgrade(migrate_engine):
+    meta = sql.MetaData()
+    meta.bind = migrate_engine
+    token = sql.Table('token', meta, autoload=True)
+    idx = sql.Index('ix_token_valid', token.c.valid)
+    idx.create(migrate_engine)