diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-04 05:58:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-04 05:58:38 +0000 |
| commit | dec2017467fadf98567c6f1a72c24f32e7e7e3e0 (patch) | |
| tree | 26b20a4eab4d3a1aea8bb23f7e3351495f48cba9 /nova/db | |
| parent | 6d417fe23020ceb8f8a5bce7c0c8293cd948c7f5 (diff) | |
| parent | ec19cf7dfcd2bf5a1712559599b90f9892c46595 (diff) | |
| download | nova-dec2017467fadf98567c6f1a72c24f32e7e7e3e0.tar.gz | |
Merge "Added removing of tags from instance after its deletion"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 2281920b72..819d283905 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1710,6 +1710,9 @@ def instance_destroy(context, instance_uuid, constraint=None): model_query(context, models.InstanceSystemMetadata, session=session).\ filter_by(instance_uuid=instance_uuid).\ soft_delete() + # NOTE(snikitin): We can't use model_query here, because there is no + # column 'deleted' in 'tags' table. + session.query(models.Tag).filter_by(resource_id=instance_uuid).delete() return instance_ref |