remove keystone-moon

Change-Id: I80d7c9b669f19d5f6607e162de8e0e55c2f80fdd
Signed-off-by: RHE <rebirthmonkey@gmail.com>

35 files changed, 0 insertions, 1690 deletions

diff --git a/keystone-moon/keystone/common/sql/migrate_repo/README b/keystone-moon/keystone/common/sql/migrate_repo/README
deleted file mode 100644
index 4ea8dd4f..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a database migration repository.
-
-More information at
-https://git.openstack.org/cgit/openstack/sqlalchemy-migrate
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/__init__.py b/keystone-moon/keystone/common/sql/migrate_repo/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/__init__.py
+++ /dev/null
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/manage.py b/keystone-moon/keystone/common/sql/migrate_repo/manage.py
deleted file mode 100644
index 39fa3892..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/manage.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-from migrate.versioning.shell import main
-
-if __name__ == '__main__':
-    main(debug='False')
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/migrate.cfg b/keystone-moon/keystone/common/sql/migrate_repo/migrate.cfg
deleted file mode 100644
index db531bb4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/migrate.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[db_settings]
-# Used to identify which repository this database is versioned under.
-# You can use the name of your project.
-repository_id=keystone
-
-# The name of the database table used to track the schema version.
-# This name shouldn't already be used by your project.
-# If this is changed once a database is under version control, you'll need to
-# change the table name in each database too.
-version_table=migrate_version
-
-# When committing a change script, Migrate will attempt to generate the
-# sql for all supported databases; normally, if one of them fails - probably
-# because you don't have that database installed - it is ignored and the
-# commit continues, perhaps ending successfully.
-# Databases in this list MUST compile successfully during a commit, or the
-# entire commit will fail. List the databases your application will actually
-# be using to ensure your updates to that database work properly.
-# This must be a list; example: ['postgres','sqlite']
-required_dbs=[]
-
-# When creating new change scripts, Migrate will stamp the new script with
-# a version number. By default this is latest_version + 1. You can set this
-# to 'true' to tell Migrate to use the UTC timestamp instead.
-use_timestamp_numbering=False
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/067_kilo.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/067_kilo.py
deleted file mode 100644
index a6dbed67..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/067_kilo.py
+++ /dev/null
@@ -1,317 +0,0 @@
-# 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 migrate
-from oslo_log import log
-import sqlalchemy as sql
-
-from keystone.assignment.backends import sql as assignment_sql
-from keystone.common import sql as ks_sql
-from keystone.identity.mapping_backends import mapping as mapping_backend
-
-
-LOG = log.getLogger(__name__)
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    if migrate_engine.name == 'mysql':
-        # In Folsom we explicitly converted migrate_version to UTF8.
-        migrate_engine.execute(
-            'ALTER TABLE migrate_version CONVERT TO CHARACTER SET utf8')
-        # Set default DB charset to UTF8.
-        migrate_engine.execute(
-            'ALTER DATABASE %s DEFAULT CHARACTER SET utf8' %
-            migrate_engine.url.database)
-
-    credential = sql.Table(
-        'credential', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('user_id', sql.String(length=64), nullable=False),
-        sql.Column('project_id', sql.String(length=64)),
-        sql.Column('blob', ks_sql.JsonBlob, nullable=False),
-        sql.Column('type', sql.String(length=255), nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    domain = sql.Table(
-        'domain', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('name', sql.String(length=64), nullable=False),
-        sql.Column('enabled', sql.Boolean, default=True, nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    endpoint = sql.Table(
-        'endpoint', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('legacy_endpoint_id', sql.String(length=64)),
-        sql.Column('interface', sql.String(length=8), nullable=False),
-        sql.Column('service_id', sql.String(length=64), nullable=False),
-        sql.Column('url', sql.Text, nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        sql.Column('enabled', sql.Boolean, nullable=False, default=True,
-                   server_default='1'),
-        sql.Column('region_id', sql.String(length=255), nullable=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    group = sql.Table(
-        'group', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('domain_id', sql.String(length=64), nullable=False),
-        sql.Column('name', sql.String(length=64), nullable=False),
-        sql.Column('description', sql.Text),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    policy = sql.Table(
-        'policy', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('type', sql.String(length=255), nullable=False),
-        sql.Column('blob', ks_sql.JsonBlob, nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    project = sql.Table(
-        'project', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('name', sql.String(length=64), nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        sql.Column('description', sql.Text),
-        sql.Column('enabled', sql.Boolean),
-        sql.Column('domain_id', sql.String(length=64), nullable=False),
-        sql.Column('parent_id', sql.String(64), nullable=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    role = sql.Table(
-        'role', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('name', sql.String(length=255), nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    service = sql.Table(
-        'service', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('type', sql.String(length=255)),
-        sql.Column('enabled', sql.Boolean, nullable=False, default=True,
-                   server_default='1'),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    token = sql.Table(
-        'token', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('expires', sql.DateTime, default=None),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        sql.Column('valid', sql.Boolean, default=True, nullable=False),
-        sql.Column('trust_id', sql.String(length=64)),
-        sql.Column('user_id', sql.String(length=64)),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    trust = sql.Table(
-        'trust', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('trustor_user_id', sql.String(length=64), nullable=False),
-        sql.Column('trustee_user_id', sql.String(length=64), nullable=False),
-        sql.Column('project_id', sql.String(length=64)),
-        sql.Column('impersonation', sql.Boolean, nullable=False),
-        sql.Column('deleted_at', sql.DateTime),
-        sql.Column('expires_at', sql.DateTime),
-        sql.Column('remaining_uses', sql.Integer, nullable=True),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    trust_role = sql.Table(
-        'trust_role', meta,
-        sql.Column('trust_id', sql.String(length=64), primary_key=True,
-                   nullable=False),
-        sql.Column('role_id', sql.String(length=64), primary_key=True,
-                   nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    user = sql.Table(
-        'user', meta,
-        sql.Column('id', sql.String(length=64), primary_key=True),
-        sql.Column('name', sql.String(length=255), nullable=False),
-        sql.Column('extra', ks_sql.JsonBlob.impl),
-        sql.Column('password', sql.String(length=128)),
-        sql.Column('enabled', sql.Boolean),
-        sql.Column('domain_id', sql.String(length=64), nullable=False),
-        sql.Column('default_project_id', sql.String(length=64)),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    user_group_membership = sql.Table(
-        'user_group_membership', meta,
-        sql.Column('user_id', sql.String(length=64), primary_key=True),
-        sql.Column('group_id', sql.String(length=64), primary_key=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    region = sql.Table(
-        'region',
-        meta,
-        sql.Column('id', sql.String(255), primary_key=True),
-        sql.Column('description', sql.String(255), nullable=False),
-        sql.Column('parent_region_id', sql.String(255), nullable=True),
-        sql.Column('extra', sql.Text()),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    assignment = sql.Table(
-        'assignment',
-        meta,
-        sql.Column('type', sql.Enum(
-            assignment_sql.AssignmentType.USER_PROJECT,
-            assignment_sql.AssignmentType.GROUP_PROJECT,
-            assignment_sql.AssignmentType.USER_DOMAIN,
-            assignment_sql.AssignmentType.GROUP_DOMAIN,
-            name='type'),
-            nullable=False),
-        sql.Column('actor_id', sql.String(64), nullable=False),
-        sql.Column('target_id', sql.String(64), nullable=False),
-        sql.Column('role_id', sql.String(64), nullable=False),
-        sql.Column('inherited', sql.Boolean, default=False, nullable=False),
-        sql.PrimaryKeyConstraint('type', 'actor_id', 'target_id', 'role_id'),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    mapping = sql.Table(
-        'id_mapping',
-        meta,
-        sql.Column('public_id', sql.String(64), primary_key=True),
-        sql.Column('domain_id', sql.String(64), nullable=False),
-        sql.Column('local_id', sql.String(64), nullable=False),
-        sql.Column('entity_type', sql.Enum(
-            mapping_backend.EntityType.USER,
-            mapping_backend.EntityType.GROUP,
-            name='entity_type'),
-            nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    domain_config_whitelist = sql.Table(
-        'whitelisted_config',
-        meta,
-        sql.Column('domain_id', sql.String(64), primary_key=True),
-        sql.Column('group', sql.String(255), primary_key=True),
-        sql.Column('option', sql.String(255), primary_key=True),
-        sql.Column('value', ks_sql.JsonBlob.impl, nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    domain_config_sensitive = sql.Table(
-        'sensitive_config',
-        meta,
-        sql.Column('domain_id', sql.String(64), primary_key=True),
-        sql.Column('group', sql.String(255), primary_key=True),
-        sql.Column('option', sql.String(255), primary_key=True),
-        sql.Column('value', ks_sql.JsonBlob.impl, nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    # create all tables
-    tables = [credential, domain, endpoint, group, policy, project, role,
-              service, token, trust, trust_role, user, user_group_membership,
-              region, assignment, mapping, domain_config_whitelist,
-              domain_config_sensitive]
-
-    for table in tables:
-        try:
-            table.create()
-        except Exception:
-            LOG.exception('Exception while creating table: %r', table)
-            raise
-
-    # Unique Constraints
-    migrate.UniqueConstraint(user.c.domain_id,
-                             user.c.name,
-                             name='ixu_user_name_domain_id').create()
-    migrate.UniqueConstraint(group.c.domain_id,
-                             group.c.name,
-                             name='ixu_group_name_domain_id').create()
-    migrate.UniqueConstraint(role.c.name,
-                             name='ixu_role_name').create()
-    migrate.UniqueConstraint(project.c.domain_id,
-                             project.c.name,
-                             name='ixu_project_name_domain_id').create()
-    migrate.UniqueConstraint(domain.c.name,
-                             name='ixu_domain_name').create()
-    migrate.UniqueConstraint(mapping.c.domain_id,
-                             mapping.c.local_id,
-                             mapping.c.entity_type,
-                             name='domain_id').create()
-
-    # Indexes
-    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_actor_id', assignment.c.actor_id).create()
-    sql.Index('ix_token_user_id', token.c.user_id).create()
-    sql.Index('ix_token_trust_id', token.c.trust_id).create()
-    # NOTE(stevemar): The two indexes below were named 'service_id' and
-    # 'group_id' in 050_fk_consistent_indexes.py, and need to be preserved
-    sql.Index('service_id', endpoint.c.service_id).create()
-    sql.Index('group_id', user_group_membership.c.group_id).create()
-
-    fkeys = [
-        {'columns': [endpoint.c.service_id],
-         'references': [service.c.id]},
-
-        {'columns': [user_group_membership.c.group_id],
-         'references': [group.c.id],
-         'name': 'fk_user_group_membership_group_id'},
-
-        {'columns': [user_group_membership.c.user_id],
-         'references':[user.c.id],
-         'name': 'fk_user_group_membership_user_id'},
-
-        {'columns': [project.c.domain_id],
-         'references': [domain.c.id],
-         'name': 'fk_project_domain_id'},
-
-        {'columns': [endpoint.c.region_id],
-         'references': [region.c.id],
-         'name': 'fk_endpoint_region_id'},
-
-        {'columns': [project.c.parent_id],
-         'references': [project.c.id],
-         'name': 'project_parent_id_fkey'},
-    ]
-
-    if migrate_engine.name == 'sqlite':
-        # NOTE(stevemar): We need to keep this FK constraint due to 073, but
-        # only for sqlite, once we collapse 073 we can remove this constraint
-        fkeys.append(
-            {'columns': [assignment.c.role_id],
-             'references': [role.c.id],
-             'name': 'fk_assignment_role_id'})
-
-    for fkey in fkeys:
-        migrate.ForeignKeyConstraint(columns=fkey['columns'],
-                                     refcolumns=fkey['references'],
-                                     name=fkey.get('name')).create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/068_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/068_placeholder.py
deleted file mode 100644
index 111df9d4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/068_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Kilo backports. Do not use this number for new
-# Liberty work. New Liberty work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/069_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/069_placeholder.py
deleted file mode 100644
index 111df9d4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/069_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Kilo backports. Do not use this number for new
-# Liberty work. New Liberty work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/070_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/070_placeholder.py
deleted file mode 100644
index 111df9d4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/070_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Kilo backports. Do not use this number for new
-# Liberty work. New Liberty work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/071_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/071_placeholder.py
deleted file mode 100644
index 111df9d4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/071_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Kilo backports. Do not use this number for new
-# Liberty work. New Liberty work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/072_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/072_placeholder.py
deleted file mode 100644
index 111df9d4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/072_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Kilo backports. Do not use this number for new
-# Liberty work. New Liberty work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/073_insert_assignment_inherited_pk.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/073_insert_assignment_inherited_pk.py
deleted file mode 100644
index 205f809e..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/073_insert_assignment_inherited_pk.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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 migrate
-import sqlalchemy as sql
-from sqlalchemy.orm import sessionmaker
-
-from keystone.assignment.backends import sql as assignment_sql
-
-
-def upgrade(migrate_engine):
-    """Inserts inherited column to assignment table PK constraints.
-
-    For non-SQLite databases, it changes the constraint in the existing table.
-
-    For SQLite, since changing constraints is not supported, it recreates the
-    assignment table with the new PK constraint and migrates the existing data.
-
-    """
-    ASSIGNMENT_TABLE_NAME = 'assignment'
-
-    metadata = sql.MetaData()
-    metadata.bind = migrate_engine
-
-    # Retrieve the existing assignment table
-    assignment_table = sql.Table(ASSIGNMENT_TABLE_NAME, metadata,
-                                 autoload=True)
-
-    if migrate_engine.name == 'sqlite':
-        ACTOR_ID_INDEX_NAME = 'ix_actor_id'
-        TMP_ASSIGNMENT_TABLE_NAME = 'tmp_assignment'
-
-        # Define the new assignment table with a temporary name
-        new_assignment_table = sql.Table(
-            TMP_ASSIGNMENT_TABLE_NAME, metadata,
-            sql.Column('type', sql.Enum(
-                assignment_sql.AssignmentType.USER_PROJECT,
-                assignment_sql.AssignmentType.GROUP_PROJECT,
-                assignment_sql.AssignmentType.USER_DOMAIN,
-                assignment_sql.AssignmentType.GROUP_DOMAIN,
-                name='type'),
-                nullable=False),
-            sql.Column('actor_id', sql.String(64), nullable=False),
-            sql.Column('target_id', sql.String(64), nullable=False),
-            sql.Column('role_id', sql.String(64), sql.ForeignKey('role.id'),
-                       nullable=False),
-            sql.Column('inherited', sql.Boolean, default=False,
-                       nullable=False),
-            sql.PrimaryKeyConstraint('type', 'actor_id', 'target_id',
-                                     'role_id', 'inherited'),
-            mysql_engine='InnoDB',
-            mysql_charset='utf8')
-
-        # Create the new assignment table
-        new_assignment_table.create(migrate_engine, checkfirst=True)
-
-        # Change the index from the existing assignment table to the new one
-        sql.Index(ACTOR_ID_INDEX_NAME, assignment_table.c.actor_id).drop()
-        sql.Index(ACTOR_ID_INDEX_NAME,
-                  new_assignment_table.c.actor_id).create()
-
-        # Instantiate session
-        maker = sessionmaker(bind=migrate_engine)
-        session = maker()
-
-        # Migrate existing data
-        insert = new_assignment_table.insert().from_select(
-            assignment_table.c, select=session.query(assignment_table))
-        session.execute(insert)
-        session.commit()
-
-        # Drop the existing assignment table, in favor of the new one
-        assignment_table.deregister()
-        assignment_table.drop()
-
-        # Finally, rename the new table to the original assignment table name
-        new_assignment_table.rename(ASSIGNMENT_TABLE_NAME)
-    elif migrate_engine.name == 'ibm_db_sa':
-        # Recreate the existing constraint, marking the inherited column as PK
-        # for DB2.
-
-        # This is a workaround to the general case in the else statement below.
-        # Due to a bug in the DB2 sqlalchemy dialect, Column.alter() actually
-        # creates a primary key over only the "inherited" column. This is wrong
-        # because the primary key for the table actually covers other columns
-        # too, not just the "inherited" column. Since the primary key already
-        # exists for the table after the Column.alter() call, it causes the
-        # next line to fail with an error that the primary key already exists.
-
-        # The workaround here skips doing the Column.alter(). This causes a
-        # warning message since the metadata is out of sync. We can remove this
-        # workaround once the DB2 sqlalchemy dialect is fixed.
-        # DB2 Issue: https://code.google.com/p/ibm-db/issues/detail?id=173
-
-        migrate.PrimaryKeyConstraint(table=assignment_table).drop()
-        migrate.PrimaryKeyConstraint(
-            assignment_table.c.type, assignment_table.c.actor_id,
-            assignment_table.c.target_id, assignment_table.c.role_id,
-            assignment_table.c.inherited).create()
-    else:
-        # Recreate the existing constraint, marking the inherited column as PK
-        migrate.PrimaryKeyConstraint(table=assignment_table).drop()
-        assignment_table.c.inherited.alter(primary_key=True)
-        migrate.PrimaryKeyConstraint(table=assignment_table).create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/074_add_is_domain_project.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/074_add_is_domain_project.py
deleted file mode 100644
index dcb89b07..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/074_add_is_domain_project.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-
-
-_PROJECT_TABLE_NAME = 'project'
-_IS_DOMAIN_COLUMN_NAME = 'is_domain'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    project_table = sql.Table(_PROJECT_TABLE_NAME, meta, autoload=True)
-    is_domain = sql.Column(_IS_DOMAIN_COLUMN_NAME, sql.Boolean, nullable=False,
-                           server_default='0', default=False)
-    project_table.create_column(is_domain)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/075_confirm_config_registration.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/075_confirm_config_registration.py
deleted file mode 100644
index 576842c6..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/075_confirm_config_registration.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#    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
-
-REGISTRATION_TABLE = 'config_register'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    registration_table = sql.Table(
-        REGISTRATION_TABLE,
-        meta,
-        sql.Column('type', sql.String(64), primary_key=True),
-        sql.Column('domain_id', sql.String(64), nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    registration_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/076_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/076_placeholder.py
deleted file mode 100644
index 9f6e8415..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/076_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Liberty backports. Do not use this number for new
-# Mitaka work. New Mitaka work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/077_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/077_placeholder.py
deleted file mode 100644
index 9f6e8415..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/077_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Liberty backports. Do not use this number for new
-# Mitaka work. New Mitaka work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/078_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/078_placeholder.py
deleted file mode 100644
index 9f6e8415..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/078_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Liberty backports. Do not use this number for new
-# Mitaka work. New Mitaka work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/079_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/079_placeholder.py
deleted file mode 100644
index 9f6e8415..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/079_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Liberty backports. Do not use this number for new
-# Mitaka work. New Mitaka work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/080_placeholder.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/080_placeholder.py
deleted file mode 100644
index 9f6e8415..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/080_placeholder.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#    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.
-
-# This is a placeholder for Liberty backports. Do not use this number for new
-# Mitaka work. New Mitaka work starts after all the placeholders.
-
-
-def upgrade(migrate_engine):
-    pass
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/081_add_endpoint_policy_table.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/081_add_endpoint_policy_table.py
deleted file mode 100644
index a0c307d0..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/081_add_endpoint_policy_table.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# 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
-
-from keystone.common.sql import migration_helpers
-
-
-def upgrade(migrate_engine):
-    try:
-        extension_version = migration_helpers.get_db_version(
-            extension='endpoint_policy',
-            engine=migrate_engine)
-    except Exception:
-        extension_version = 0
-
-    # This migration corresponds to endpoint_policy extension migration 1. Only
-    # update if it has not been run.
-    if extension_version >= 1:
-        return
-
-    # Upgrade operations go here. Don't create your own engine; bind
-    # migrate_engine to your metadata
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    endpoint_policy_table = sql.Table(
-        'policy_association',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('policy_id', sql.String(64),
-                   nullable=False),
-        sql.Column('endpoint_id', sql.String(64),
-                   nullable=True),
-        sql.Column('service_id', sql.String(64),
-                   nullable=True),
-        sql.Column('region_id', sql.String(64),
-                   nullable=True),
-        sql.UniqueConstraint('endpoint_id', 'service_id', 'region_id'),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-
-    endpoint_policy_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/082_add_federation_tables.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/082_add_federation_tables.py
deleted file mode 100644
index 7e426373..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/082_add_federation_tables.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# 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.
-
-from oslo_config import cfg
-import sqlalchemy as sql
-
-from keystone.common.sql import migration_helpers
-
-CONF = cfg.CONF
-_RELAY_STATE_PREFIX = 'relay_state_prefix'
-
-
-def upgrade(migrate_engine):
-    try:
-        extension_version = migration_helpers.get_db_version(
-            extension='federation',
-            engine=migrate_engine)
-    except Exception:
-        extension_version = 0
-
-    # This migration corresponds to federation extension migration 8. Only
-    # update if it has not been run.
-    if extension_version >= 8:
-        return
-
-    # Upgrade operations go here. Don't create your own engine; bind
-    # migrate_engine to your metadata
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    idp_table = sql.Table(
-        'identity_provider',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('enabled', sql.Boolean, nullable=False),
-        sql.Column('description', sql.Text(), nullable=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    idp_table.create(migrate_engine, checkfirst=True)
-
-    federation_protocol_table = sql.Table(
-        'federation_protocol',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('idp_id', sql.String(64),
-                   sql.ForeignKey('identity_provider.id', ondelete='CASCADE'),
-                   primary_key=True),
-        sql.Column('mapping_id', sql.String(64), nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    federation_protocol_table.create(migrate_engine, checkfirst=True)
-
-    mapping_table = sql.Table(
-        'mapping',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('rules', sql.Text(), nullable=False),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    mapping_table.create(migrate_engine, checkfirst=True)
-
-    relay_state_prefix_default = CONF.saml.relay_state_prefix
-    sp_table = sql.Table(
-        'service_provider',
-        meta,
-        sql.Column('auth_url', sql.String(256), nullable=False),
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('enabled', sql.Boolean, nullable=False),
-        sql.Column('description', sql.Text(), nullable=True),
-        sql.Column('sp_url', sql.String(256), nullable=False),
-        sql.Column(_RELAY_STATE_PREFIX, sql.String(256), nullable=False,
-                   server_default=relay_state_prefix_default),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    sp_table.create(migrate_engine, checkfirst=True)
-
-    idp_table = sql.Table('identity_provider', meta, autoload=True)
-    remote_id_table = sql.Table(
-        'idp_remote_ids',
-        meta,
-        sql.Column('idp_id', sql.String(64),
-                   sql.ForeignKey('identity_provider.id', ondelete='CASCADE')),
-        sql.Column('remote_id', sql.String(255), primary_key=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    remote_id_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/083_add_oauth1_tables.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/083_add_oauth1_tables.py
deleted file mode 100644
index 5a859b4b..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/083_add_oauth1_tables.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# 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
-
-from keystone.common.sql import migration_helpers
-
-
-def upgrade(migrate_engine):
-    try:
-        extension_version = migration_helpers.get_db_version(
-            extension='oauth1',
-            engine=migrate_engine)
-    except Exception:
-        extension_version = 0
-
-    # This migration corresponds to oauth extension migration 5. Only
-    # update if it has not been run.
-    if extension_version >= 5:
-        return
-
-    # Upgrade operations go here. Don't create your own engine; bind
-    # migrate_engine to your metadata
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    consumer_table = sql.Table(
-        'consumer',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True, nullable=False),
-        sql.Column('description', sql.String(64), nullable=True),
-        sql.Column('secret', sql.String(64), nullable=False),
-        sql.Column('extra', sql.Text(), nullable=False))
-    consumer_table.create(migrate_engine, checkfirst=True)
-
-    request_token_table = sql.Table(
-        'request_token',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True, nullable=False),
-        sql.Column('request_secret', sql.String(64), nullable=False),
-        sql.Column('verifier', sql.String(64), nullable=True),
-        sql.Column('authorizing_user_id', sql.String(64), nullable=True),
-        sql.Column('requested_project_id', sql.String(64), nullable=False),
-        sql.Column('role_ids', sql.Text(), nullable=True),
-        sql.Column('consumer_id', sql.String(64),
-                   sql.ForeignKey('consumer.id'),
-                   nullable=False, index=True),
-        sql.Column('expires_at', sql.String(64), nullable=True))
-    request_token_table.create(migrate_engine, checkfirst=True)
-
-    access_token_table = sql.Table(
-        'access_token',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True, nullable=False),
-        sql.Column('access_secret', sql.String(64), nullable=False),
-        sql.Column('authorizing_user_id', sql.String(64),
-                   nullable=False, index=True),
-        sql.Column('project_id', sql.String(64), nullable=False),
-        sql.Column('role_ids', sql.Text(), nullable=False),
-        sql.Column('consumer_id', sql.String(64),
-                   sql.ForeignKey('consumer.id'),
-                   nullable=False, index=True),
-        sql.Column('expires_at', sql.String(64), nullable=True))
-    access_token_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/084_add_revoke_tables.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/084_add_revoke_tables.py
deleted file mode 100644
index 1a28a53c..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/084_add_revoke_tables.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2014 IBM Corp.
-#
-# 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
-
-from keystone.common.sql import migration_helpers
-
-
-def upgrade(migrate_engine):
-    try:
-        extension_version = migration_helpers.get_db_version(
-            extension='revoke',
-            engine=migrate_engine)
-    except Exception:
-        extension_version = 0
-
-    # This migration corresponds to revoke extension migration 2. Only
-    # update if it has not been run.
-    if extension_version >= 2:
-        return
-
-    # Upgrade operations go here. Don't create your own engine; bind
-    # migrate_engine to your metadata
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    service_table = sql.Table(
-        'revocation_event',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('domain_id', sql.String(64)),
-        sql.Column('project_id', sql.String(64)),
-        sql.Column('user_id', sql.String(64)),
-        sql.Column('role_id', sql.String(64)),
-        sql.Column('trust_id', sql.String(64)),
-        sql.Column('consumer_id', sql.String(64)),
-        sql.Column('access_token_id', sql.String(64)),
-        sql.Column('issued_before', sql.DateTime(), nullable=False),
-        sql.Column('expires_at', sql.DateTime()),
-        sql.Column('revoked_at', sql.DateTime(), index=True, nullable=False),
-        sql.Column('audit_id', sql.String(32), nullable=True),
-        sql.Column('audit_chain_id', sql.String(32), nullable=True))
-
-    service_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/085_add_endpoint_filtering_table.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/085_add_endpoint_filtering_table.py
deleted file mode 100644
index 5790bd98..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/085_add_endpoint_filtering_table.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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
-
-from keystone.common.sql import migration_helpers
-
-
-def upgrade(migrate_engine):
-    try:
-        extension_version = migration_helpers.get_db_version(
-            extension='endpoint_filter',
-            engine=migrate_engine)
-    except Exception:
-        extension_version = 0
-
-    # This migration corresponds to endpoint_filter extension migration 2. Only
-    # update if it has not been run.
-    if extension_version >= 2:
-        return
-
-    # Upgrade operations go here. Don't create your own engine; bind
-    # migrate_engine to your metadata
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    EP_GROUP_ID = 'endpoint_group_id'
-    PROJECT_ID = 'project_id'
-
-    endpoint_filtering_table = sql.Table(
-        'project_endpoint',
-        meta,
-        sql.Column(
-            'endpoint_id',
-            sql.String(64),
-            primary_key=True,
-            nullable=False),
-        sql.Column(
-            'project_id',
-            sql.String(64),
-            primary_key=True,
-            nullable=False))
-    endpoint_filtering_table.create(migrate_engine, checkfirst=True)
-
-    endpoint_group_table = sql.Table(
-        'endpoint_group',
-        meta,
-        sql.Column('id', sql.String(64), primary_key=True),
-        sql.Column('name', sql.String(255), nullable=False),
-        sql.Column('description', sql.Text, nullable=True),
-        sql.Column('filters', sql.Text(), nullable=False))
-    endpoint_group_table.create(migrate_engine, checkfirst=True)
-
-    project_endpoint_group_table = sql.Table(
-        'project_endpoint_group',
-        meta,
-        sql.Column(EP_GROUP_ID, sql.String(64),
-                   sql.ForeignKey('endpoint_group.id'), nullable=False),
-        sql.Column(PROJECT_ID, sql.String(64), nullable=False),
-        sql.PrimaryKeyConstraint(EP_GROUP_ID, PROJECT_ID))
-    project_endpoint_group_table.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/086_add_duplicate_constraint_trusts.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/086_add_duplicate_constraint_trusts.py
deleted file mode 100644
index 2b115ea4..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/086_add_duplicate_constraint_trusts.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2015 Intel Corporation
-# All Rights Reserved
-#
-#    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.
-
-from migrate import UniqueConstraint
-from sqlalchemy import MetaData, Table
-
-
-def upgrade(migrate_engine):
-    meta = MetaData(bind=migrate_engine)
-    trusts = Table('trust', meta, autoload=True)
-
-    UniqueConstraint('trustor_user_id', 'trustee_user_id', 'project_id',
-                     'impersonation', 'expires_at', table=trusts,
-                     name='duplicate_trust_constraint').create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/087_implied_roles.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/087_implied_roles.py
deleted file mode 100644
index 7713ce8f..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/087_implied_roles.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#    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 migrate
-import sqlalchemy as sql
-
-
-ROLE_TABLE = 'role'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    implied_role = sql.Table(
-        'implied_role', meta,
-        sql.Column('prior_role_id', sql.String(length=64), primary_key=True),
-        sql.Column(
-            'implied_role_id', sql.String(length=64), primary_key=True),
-        mysql_engine='InnoDB',
-        mysql_charset='utf8')
-    implied_role.create()
-    role = sql.Table(ROLE_TABLE, meta, autoload=True)
-    fkeys = [
-        {'columns': [implied_role.c.prior_role_id],
-         'references': [role.c.id]},
-        {'columns': [implied_role.c.implied_role_id],
-         'references': [role.c.id]},
-    ]
-    for fkey in fkeys:
-        migrate.ForeignKeyConstraint(columns=fkey['columns'],
-                                     refcolumns=fkey['references'],
-                                     name=fkey.get('name')).create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/088_domain_specific_roles.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/088_domain_specific_roles.py
deleted file mode 100644
index 8b792dfa..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/088_domain_specific_roles.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 migrate
-import sqlalchemy as sql
-
-
-_ROLE_NAME_NEW_CONSTRAINT = 'ixu_role_name_domain_id'
-_ROLE_TABLE_NAME = 'role'
-_ROLE_NAME_COLUMN_NAME = 'name'
-_DOMAIN_ID_COLUMN_NAME = 'domain_id'
-_NULL_DOMAIN_ID = '<<null>>'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    role_table = sql.Table(_ROLE_TABLE_NAME, meta, autoload=True)
-    domain_id = sql.Column(_DOMAIN_ID_COLUMN_NAME, sql.String(64),
-                           nullable=False, server_default=_NULL_DOMAIN_ID)
-
-    # NOTE(morganfainberg): the `role_name` unique constraint is not
-    # guaranteed to be a fixed name, such as 'ixu_role_name`, so we need to
-    # search for the correct constraint that only affects role_table.c.name
-    # and drop that constraint.
-    to_drop = None
-    if migrate_engine.name == 'mysql':
-        for c in role_table.indexes:
-            if (c.unique and len(c.columns) == 1 and
-                    _ROLE_NAME_COLUMN_NAME in c.columns):
-                to_drop = c
-                break
-    else:
-        for c in role_table.constraints:
-            if len(c.columns) == 1 and _ROLE_NAME_COLUMN_NAME in c.columns:
-                to_drop = c
-                break
-
-    if to_drop is not None:
-        migrate.UniqueConstraint(role_table.c.name,
-                                 name=to_drop.name).drop()
-
-    # perform changes after constraint is dropped.
-    if 'domain_id' not in role_table.columns:
-        # Only create the column if it doesn't already exist.
-        role_table.create_column(domain_id)
-
-    migrate.UniqueConstraint(role_table.c.name,
-                             role_table.c.domain_id,
-                             name=_ROLE_NAME_NEW_CONSTRAINT).create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/089_add_root_of_all_domains.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/089_add_root_of_all_domains.py
deleted file mode 100644
index 477c719a..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/089_add_root_of_all_domains.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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
-
-
-_PROJECT_TABLE_NAME = 'project'
-_DOMAIN_TABLE_NAME = 'domain'
-NULL_DOMAIN_ID = '<<keystone.domain.root>>'
-
-
-def upgrade(migrate_engine):
-
-    def _generate_root_domain_project():
-        # Generate a project that will act as a root for all domains, in order
-        # for use to be able to use a FK constraint on domain_id. Projects
-        # acting as a domain will not reference this as their parent_id, just
-        # as domain_id.
-        #
-        # This special project is filtered out by the driver, so is never
-        # visible to the manager or API.
-
-        project_ref = {
-            'id': NULL_DOMAIN_ID,
-            'name': NULL_DOMAIN_ID,
-            'enabled': False,
-            'description': '',
-            'domain_id': NULL_DOMAIN_ID,
-            'is_domain': True,
-            'parent_id': None,
-            'extra': '{}'
-        }
-        return project_ref
-
-    def _generate_root_domain():
-        # Generate a similar root for the domain table, this is an interim
-        # step so as to allow continuation of current project domain_id FK.
-        #
-        # This special domain is filtered out by the driver, so is never
-        # visible to the manager or API.
-
-        domain_ref = {
-            'id': NULL_DOMAIN_ID,
-            'name': NULL_DOMAIN_ID,
-            'enabled': False,
-            'extra': '{}'
-        }
-        return domain_ref
-
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-    session = sql.orm.sessionmaker(bind=migrate_engine)()
-
-    project_table = sql.Table(_PROJECT_TABLE_NAME, meta, autoload=True)
-    domain_table = sql.Table(_DOMAIN_TABLE_NAME, meta, autoload=True)
-
-    root_domain = _generate_root_domain()
-    new_entry = domain_table.insert().values(**root_domain)
-    session.execute(new_entry)
-    session.commit()
-
-    root_domain_project = _generate_root_domain_project()
-    new_entry = project_table.insert().values(**root_domain_project)
-    session.execute(new_entry)
-    session.commit()
-
-    session.close()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/090_add_local_user_and_password_tables.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/090_add_local_user_and_password_tables.py
deleted file mode 100644
index 800ba47e..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/090_add_local_user_and_password_tables.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
-
-    user = sql.Table('user', meta, autoload=True)
-
-    local_user = sql.Table(
-        'local_user',
-        meta,
-        sql.Column('id', sql.Integer, primary_key=True, nullable=False),
-        sql.Column('user_id', sql.String(64),
-                   sql.ForeignKey(user.c.id, ondelete='CASCADE'),
-                   nullable=False, unique=True),
-        sql.Column('domain_id', sql.String(64), nullable=False),
-        sql.Column('name', sql.String(255), nullable=False),
-        sql.UniqueConstraint('domain_id', 'name'))
-    local_user.create(migrate_engine, checkfirst=True)
-
-    password = sql.Table(
-        'password',
-        meta,
-        sql.Column('id', sql.Integer, primary_key=True, nullable=False),
-        sql.Column('local_user_id', sql.Integer,
-                   sql.ForeignKey(local_user.c.id, ondelete='CASCADE'),
-                   nullable=False),
-        sql.Column('password', sql.String(128), nullable=False))
-    password.create(migrate_engine, checkfirst=True)
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/091_migrate_data_to_local_user_and_password_tables.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/091_migrate_data_to_local_user_and_password_tables.py
deleted file mode 100644
index 1f41fd89..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/091_migrate_data_to_local_user_and_password_tables.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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 migrate
-import sqlalchemy as sql
-from sqlalchemy import func
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    user_table = sql.Table('user', meta, autoload=True)
-    local_user_table = sql.Table('local_user', meta, autoload=True)
-    password_table = sql.Table('password', meta, autoload=True)
-
-    # migrate data to local_user table
-    local_user_values = []
-    for row in user_table.select().execute():
-        # skip the row that already exists in `local_user`, this could
-        # happen if run into a partially-migrated table due to the
-        # bug #1549705.
-        filter_by = local_user_table.c.user_id == row['id']
-        user_count = sql.select([func.count()]).select_from(
-            local_user_table).where(filter_by).execute().fetchone()[0]
-        if user_count == 0:
-            local_user_values.append({'user_id': row['id'],
-                                      'domain_id': row['domain_id'],
-                                      'name': row['name']})
-    if local_user_values:
-        local_user_table.insert().values(local_user_values).execute()
-
-    # migrate data to password table
-    sel = (
-        sql.select([user_table, local_user_table], use_labels=True)
-           .select_from(user_table.join(local_user_table, user_table.c.id ==
-                                        local_user_table.c.user_id))
-    )
-    user_rows = sel.execute()
-    password_values = []
-    for row in user_rows:
-        if row['user_password']:
-            password_values.append({'local_user_id': row['local_user_id'],
-                                    'password': row['user_password']})
-    if password_values:
-        password_table.insert().values(password_values).execute()
-
-    # remove domain_id and name unique constraint
-    if migrate_engine.name != 'sqlite':
-        migrate.UniqueConstraint(user_table.c.domain_id,
-                                 user_table.c.name,
-                                 name='ixu_user_name_domain_id').drop()
-
-    # drop user columns
-    user_table.c.domain_id.drop()
-    user_table.c.name.drop()
-    user_table.c.password.drop()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/092_make_implied_roles_fks_cascaded.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/092_make_implied_roles_fks_cascaded.py
deleted file mode 100644
index 5e841899..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/092_make_implied_roles_fks_cascaded.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#    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 migrate
-import sqlalchemy as sql
-
-
-ROLE_TABLE = 'role'
-IMPLIED_ROLE_TABLE = 'implied_role'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    role = sql.Table(ROLE_TABLE, meta, autoload=True)
-    implied_role = sql.Table(IMPLIED_ROLE_TABLE, meta, autoload=True)
-
-    fkeys = [
-        {'columns': [implied_role.c.prior_role_id],
-         'references': [role.c.id]},
-        {'columns': [implied_role.c.implied_role_id],
-         'references': [role.c.id]},
-    ]
-
-    # NOTE(stevemar): We need to divide these into two separate loops otherwise
-    # they may clobber each other and only end up with one foreign key.
-    for fkey in fkeys:
-        migrate.ForeignKeyConstraint(columns=fkey['columns'],
-                                     refcolumns=fkey['references'],
-                                     name=fkey.get('name')).drop()
-    for fkey in fkeys:
-        migrate.ForeignKeyConstraint(columns=fkey['columns'],
-                                     refcolumns=fkey['references'],
-                                     name=fkey.get('name'),
-                                     ondelete="CASCADE").create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/093_migrate_domains_to_projects.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/093_migrate_domains_to_projects.py
deleted file mode 100644
index f6bba7d9..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/093_migrate_domains_to_projects.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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 json
-
-import sqlalchemy as sql
-
-from keystone.common.sql import migration_helpers
-
-
-_PROJECT_TABLE_NAME = 'project'
-_DOMAIN_TABLE_NAME = 'domain'
-_PARENT_ID_COLUMN_NAME = 'parent_id'
-_DOMAIN_ID_COLUMN_NAME = 'domain_id'
-
-# Above the driver level, the domain_id of a project acting as a domain is
-# None. However, in order to enable sql integrity constraints to still operate
-# on this column, we create a special "root of all domains" row, with an ID of
-# NULL_DOMAIN_ID, which all projects acting as a domain reference in their
-# domain_id attribute. This special row, as well as NULL_DOMAIN_ID, are never
-# exposed outside of sql driver layer.
-NULL_DOMAIN_ID = '<<keystone.domain.root>>'
-
-
-def list_existing_project_constraints(project_table, domain_table):
-    constraints = [{'table': project_table,
-                    'fk_column': _PARENT_ID_COLUMN_NAME,
-                    'ref_column': project_table.c.id},
-                   {'table': project_table,
-                    'fk_column': _DOMAIN_ID_COLUMN_NAME,
-                    'ref_column': domain_table.c.id}]
-
-    return constraints
-
-
-def list_new_project_constraints(project_table):
-    constraints = [{'table': project_table,
-                    'fk_column': _PARENT_ID_COLUMN_NAME,
-                    'ref_column': project_table.c.id},
-                   {'table': project_table,
-                    'fk_column': _DOMAIN_ID_COLUMN_NAME,
-                    'ref_column': project_table.c.id}]
-
-    return constraints
-
-
-def upgrade(migrate_engine):
-
-    def _project_from_domain(domain):
-        # Creates a project dict with is_domain=True from the provided
-        # domain.
-
-        description = None
-        extra = {}
-        if domain.extra is not None:
-            # 'description' property is an extra attribute in domains but a
-            # first class attribute in projects
-            extra = json.loads(domain.extra)
-            description = extra.pop('description', None)
-
-        return {
-            'id': domain.id,
-            'name': domain.name,
-            'enabled': domain.enabled,
-            'description': description,
-            'domain_id': NULL_DOMAIN_ID,
-            'is_domain': True,
-            'parent_id': None,
-            'extra': json.dumps(extra)
-        }
-
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-    session = sql.orm.sessionmaker(bind=migrate_engine)()
-
-    project_table = sql.Table(_PROJECT_TABLE_NAME, meta, autoload=True)
-    domain_table = sql.Table(_DOMAIN_TABLE_NAME, meta, autoload=True)
-
-    # NOTE(htruta): Remove the parent_id constraint during the migration
-    # because for every root project inside this domain, we will set
-    # the project domain_id to be its parent_id. We re-enable the constraint
-    # in the end of this method. We also remove the domain_id constraint,
-    # while be recreated a FK to the project_id at the end.
-    migration_helpers.remove_constraints(
-        list_existing_project_constraints(project_table, domain_table))
-
-    # For each domain, create a project acting as a domain. We ignore the
-    # "root of all domains" row, since we already have one of these in the
-    # project table.
-    domains = list(domain_table.select().execute())
-    for domain in domains:
-        if domain.id == NULL_DOMAIN_ID:
-            continue
-        is_domain_project = _project_from_domain(domain)
-        new_entry = project_table.insert().values(**is_domain_project)
-        session.execute(new_entry)
-        session.commit()
-
-    # For each project, that has no parent (i.e. a top level project), update
-    # it's parent_id to point at the project acting as its domain. We ignore
-    # the "root of all domains" row, since its parent_id must always be None.
-    projects = list(project_table.select().execute())
-    for project in projects:
-        if (project.parent_id is not None or project.is_domain or
-                project.id == NULL_DOMAIN_ID):
-            continue
-        values = {'parent_id': project.domain_id}
-        update = project_table.update().where(
-            project_table.c.id == project.id).values(values)
-        session.execute(update)
-        session.commit()
-
-    migration_helpers.add_constraints(
-        list_new_project_constraints(project_table))
-
-    session.close()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/094_add_federated_user_table.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/094_add_federated_user_table.py
deleted file mode 100644
index 6fd3f051..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/094_add_federated_user_table.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 migrate
-import sqlalchemy as sql
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    user_table = sql.Table('user', meta, autoload=True)
-    idp_table = sql.Table('identity_provider', meta, autoload=True)
-    protocol_table = sql.Table('federation_protocol', meta, autoload=True)
-
-    federated_table = sql.Table(
-        'federated_user',
-        meta,
-        sql.Column('id', sql.Integer, primary_key=True, nullable=False),
-        sql.Column('user_id', sql.String(64),
-                   sql.ForeignKey(user_table.c.id, ondelete='CASCADE'),
-                   nullable=False),
-        sql.Column('idp_id', sql.String(64),
-                   sql.ForeignKey(idp_table.c.id, ondelete='CASCADE'),
-                   nullable=False),
-        sql.Column('protocol_id', sql.String(64), nullable=False),
-        sql.Column('unique_id', sql.String(255), nullable=False),
-        sql.Column('display_name', sql.String(255), nullable=True),
-        sql.UniqueConstraint('idp_id', 'protocol_id', 'unique_id'))
-    federated_table.create(migrate_engine, checkfirst=True)
-
-    migrate.ForeignKeyConstraint(
-        columns=[federated_table.c.protocol_id, federated_table.c.idp_id],
-        refcolumns=[protocol_table.c.id, protocol_table.c.idp_id]).create()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/095_add_integer_pkey_to_revocation_event_table.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/095_add_integer_pkey_to_revocation_event_table.py
deleted file mode 100644
index 7a75f7b1..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/095_add_integer_pkey_to_revocation_event_table.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-
-    # You can specify primary keys when creating tables, however adding
-    # auto-increment integer primary keys for existing tables is not
-    # cross-engine compatibility supported. Thus, the approach is to:
-    # (1) create a new revocation_event table with an int pkey,
-    # (2) migrate data from the old table to the new table,
-    # (3) delete the old revocation_event table
-    # (4) rename the new revocation_event table
-    revocation_table = sql.Table('revocation_event', meta, autoload=True)
-
-    revocation_table_new = sql.Table(
-        'revocation_event_new',
-        meta,
-        sql.Column('id', sql.Integer, primary_key=True),
-        sql.Column('domain_id', sql.String(64)),
-        sql.Column('project_id', sql.String(64)),
-        sql.Column('user_id', sql.String(64)),
-        sql.Column('role_id', sql.String(64)),
-        sql.Column('trust_id', sql.String(64)),
-        sql.Column('consumer_id', sql.String(64)),
-        sql.Column('access_token_id', sql.String(64)),
-        sql.Column('issued_before', sql.DateTime(), nullable=False),
-        sql.Column('expires_at', sql.DateTime()),
-        sql.Column('revoked_at', sql.DateTime(), index=True, nullable=False),
-        sql.Column('audit_id', sql.String(32), nullable=True),
-        sql.Column('audit_chain_id', sql.String(32), nullable=True))
-    revocation_table_new.create(migrate_engine, checkfirst=True)
-
-    revocation_table_new.insert().from_select(['domain_id',
-                                               'project_id',
-                                               'user_id',
-                                               'role_id',
-                                               'trust_id',
-                                               'consumer_id',
-                                               'access_token_id',
-                                               'issued_before',
-                                               'expires_at',
-                                               'revoked_at',
-                                               'audit_id',
-                                               'audit_chain_id'],
-                                              revocation_table.select())
-
-    revocation_table.drop()
-    revocation_table_new.rename('revocation_event')
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/096_drop_role_name_constraint.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/096_drop_role_name_constraint.py
deleted file mode 100644
index 0156de21..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/096_drop_role_name_constraint.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 migrate
-import sqlalchemy as sql
-
-_ROLE_TABLE_NAME = 'role'
-_ROLE_NAME_COLUMN_NAME = 'name'
-
-
-def upgrade(migrate_engine):
-    meta = sql.MetaData()
-    meta.bind = migrate_engine
-
-    role_table = sql.Table(_ROLE_TABLE_NAME, meta, autoload=True)
-
-    # NOTE(morganfainberg): the `role_name` unique constraint is not
-    # guaranteed to be named 'ixu_role_name', so we need to search for the
-    # correct constraint that only affects role_table.c.name and drop
-    # that constraint.
-    #
-    # This is an idempotent change that reflects the fix to migration
-    # 88 if the role_name unique constraint was not named consistently and
-    # someone manually fixed the migrations / db without dropping the
-    # old constraint.
-    to_drop = None
-    if migrate_engine.name == 'mysql':
-        for c in role_table.indexes:
-            if (c.unique and len(c.columns) == 1 and
-                    _ROLE_NAME_COLUMN_NAME in c.columns):
-                to_drop = c
-                break
-    else:
-        for c in role_table.constraints:
-            if len(c.columns) == 1 and _ROLE_NAME_COLUMN_NAME in c.columns:
-                to_drop = c
-                break
-
-    if to_drop is not None:
-        migrate.UniqueConstraint(role_table.c.name,
-                                 name=to_drop.name).drop()
diff --git a/keystone-moon/keystone/common/sql/migrate_repo/versions/__init__.py b/keystone-moon/keystone/common/sql/migrate_repo/versions/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/keystone-moon/keystone/common/sql/migrate_repo/versions/__init__.py
+++ /dev/null