From 49a672afc0ddae065c65acab55a1190a95bafae4 Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Tue, 19 Feb 2013 17:58:44 -0600 Subject: Correct SQL migration 017 column name The user_project_membership still uses tenant_id and not project_id as a column name, the migration code uses project_id for both tables. Fixed bug 1130424 Change-Id: Id7c9f78235ad87103ecf469bea312e6291c0a327 --- keystone/common/sql/migrate_repo/versions/017_membership_role.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keystone/common') 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() -- cgit