diff options
| author | Mark J. Washenberger <mark.washenberger@markwash.net> | 2013-07-29 11:12:03 -0700 |
|---|---|---|
| committer | Mark J. Washenberger <mark.washenberger@markwash.net> | 2013-07-31 09:05:31 -0700 |
| commit | cf27bbe356013c11d2a8f2e12da3e5aa60e2fcf9 (patch) | |
| tree | 9a0db3ccd0ecf5adab05351cd5b68e57fb6771fe /keystone/common | |
| parent | c21b458081b011089e6819c716e63331f8df0ce4 (diff) | |
Handle json data when migrating role metadata.
Fixes bug 1206257
Change-Id: Ia522e023a2d66ec25bc909db12d358f7c0ee6952
Diffstat (limited to 'keystone/common')
| -rw-r--r-- | keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py | 4 |
1 files changed, 1 insertions, 3 deletions
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, |