Merge "Correct SQL migration 017 column name"

1 files changed, 3 insertions, 3 deletions

diff --git a/keystone/common/sql/migrate_repo/versions/017_membership_role.py b/keystone/common/sql/migrate_repo/versions/017_membership_role.py
index ed5b482f..98ed9a2a 100644
--- a/keystone/common/sql/migrate_repo/versions/017_membership_role.py
+++ b/keystone/common/sql/migrate_repo/versions/017_membership_role.py
@@ -48,7 +48,7 @@ def upgrade(migrate_engine):
         data = {'roles': [config.CONF.member_role_id]}
         ins = user_project_role_table.insert().values(
             user_id=membership.user_id,
-            project_id=membership.project_id,
+            project_id=membership.tenant_id,
             data=json.dumps(data))
         conn.execute(ins)
     session.close()
@@ -71,7 +71,7 @@ def downgrade(migrate_engine):
             sql.ForeignKey('user.id'),
             primary_key=True),
         sql.Column(
-            'project_id',
+            'tenant_id',
             sql.String(64),
             sql.ForeignKey('project.id'),
             primary_key=True))
@@ -89,7 +89,7 @@ def downgrade(migrate_engine):
             if config.CONF.member_role_id in roles:
                 ins = (user_project_membership_table.insert()
                        .values(user_id=membership.user_id,
-                               project_id=membership.project_id))
+                               tenant_id=membership.project_id))
     session.close()
     role_table = sql.Table('role', meta, autoload=True)
     conn = migrate_engine.connect()