summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Koniszewski <pawel.koniszewski@intel.com>2015-04-16 03:21:20 -0400
committerNikhil Komawar <nikhilskomawar@gmail.com>2015-04-23 15:35:20 -0400
commit0f255ddbf6f047f8bf6365c6e630ceb2dcd90323 (patch)
treebeebc6db9bf7a0fce11cf10cf881949551b215cc
parente3bed85d5123764dfa25059bba31acbf5fa9c035 (diff)
downloadglance-0f255ddbf6f047f8bf6365c6e630ceb2dcd90323.tar.gz
Read tag name instead of ID
Current version of db load_metadefs looks for tag id instead of tag name. In result user needs to provide additional unnecessary tag ID in .json file and also it may lead to conflicts in DB and unhandled exceptions. This change fixes this issue. Backport change:- Has been cherry picked from commit 2b556b2f8dd623844d0e6dffddbec5d01dd20399 Change-Id: Ie0192f87dce120221d09dba49d2eb33094464cef Closes-Bug: 1445026
-rwxr-xr-xglance/db/sqlalchemy/metadata.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py
index aeebcc3e8..c1f4a5f15 100755
--- a/glance/db/sqlalchemy/metadata.py
+++ b/glance/db/sqlalchemy/metadata.py
@@ -327,7 +327,7 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
'name': tag.get('name'),
'namespace_id': namespace_id,
}
- tag_id = _get_resource_id(tags_table, namespace_id, tag['id'])
+ tag_id = _get_resource_id(tags_table, namespace_id, tag['name'])
if not tag_id:
values.update({'created_at': timeutils.utcnow()})
_insert_data_to_db(tags_table, values)