From cf27bbe356013c11d2a8f2e12da3e5aa60e2fcf9 Mon Sep 17 00:00:00 2001 From: "Mark J. Washenberger" Date: Mon, 29 Jul 2013 11:12:03 -0700 Subject: Handle json data when migrating role metadata. Fixes bug 1206257 Change-Id: Ia522e023a2d66ec25bc909db12d358f7c0ee6952 --- .../sql/migrate_repo/versions/020_migrate_metadata_table_roles.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'keystone') diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py index 35110df4..a0c6ddbc 100644 --- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py +++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py @@ -23,11 +23,9 @@ def upgrade(migrate_engine): session = sql.orm.sessionmaker(bind=migrate_engine)() for metadata in session.query(old_metadata_table): + data = json.loads(metadata.data) if config.CONF.member_role_id not in metadata.data: - data = json.loads(metadata.data) data['roles'].append(config.CONF.member_role_id) - else: - data = metadata.data r = session.query(new_metadata_table).filter_by( user_id=metadata.user_id, -- cgit