diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 15:28:42 +0400 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 15:28:42 +0400 |
| commit | 90a1f58796822e7fa392634e2daf767975554d40 (patch) | |
| tree | 9fedcb3a4caa9c2d7747e342c4eabf7f8c36ae9d | |
| parent | 1e02e152aea76d5af30c42708caaee2fb1f05ede (diff) | |
| parent | 28568e51ab4eb84e66e7d15adc9648220684ab84 (diff) | |
trunk merged. conflict resolved.
| -rw-r--r-- | nova/virt/libvirt_conn.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index bc54835ff..456a248c9 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -166,10 +166,8 @@ def _get_network_info(instance): ip_addresses = db.fixed_ip_get_all_by_instance(admin_context, instance['id']) - networks = db.network_get_all_by_instance(admin_context, instance['id']) - flavor = db.instance_type_get_by_name(admin_context, instance['instance_type']) network_info = [] |