diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-12 16:58:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-12 16:58:49 +0000 |
| commit | 1c0d29ccccaa59aa253a7eb752f54d184addd17e (patch) | |
| tree | e3a85dc44944f9394fa4fd978341bdda3fc502cd /nova/cells | |
| parent | a3786b4b8aa47cf19b9dc2babb4df85f578a1280 (diff) | |
| parent | fed1ea1d7528e7a3d2da181112da62cf04cb5092 (diff) | |
| download | nova-1c0d29ccccaa59aa253a7eb752f54d184addd17e.tar.gz nova-1c0d29ccccaa59aa253a7eb752f54d184addd17e.tar.xz nova-1c0d29ccccaa59aa253a7eb752f54d184addd17e.zip | |
Merge "Remove instance['instance_type'] relationship from db api"
Diffstat (limited to 'nova/cells')
| -rw-r--r-- | nova/cells/messaging.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py index f83f141dc..82f0a6a48 100644 --- a/nova/cells/messaging.py +++ b/nova/cells/messaging.py @@ -749,8 +749,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods): # 'metadata' is only updated in the API cell, so don't overwrite # it based on what child cells say. Make sure to update # 'cell_name' based on the routing path. - items_to_remove = ['id', 'security_groups', 'instance_type', - 'volumes', 'cell_name', 'name', 'metadata'] + items_to_remove = ['id', 'security_groups', 'volumes', 'cell_name', + 'name', 'metadata'] for key in items_to_remove: instance.pop(key, None) instance['cell_name'] = _reverse_path(message.routing_path) |