diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-07-23 02:32:45 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-23 02:32:45 +0000 |
| commit | 1a18ea6d738b513e03e3f0eddfb9f01dff9addca (patch) | |
| tree | 244c7bfe3636515a2fa2dbeb79e3f1e83e60dc0f | |
| parent | 5c12e11b83de9deeb6dd6fb3edcd36349b248e48 (diff) | |
| parent | 0206da24a6d9175b9dd50000fb9d8435355696bd (diff) | |
| download | nova-1a18ea6d738b513e03e3f0eddfb9f01dff9addca.tar.gz nova-1a18ea6d738b513e03e3f0eddfb9f01dff9addca.tar.xz nova-1a18ea6d738b513e03e3f0eddfb9f01dff9addca.zip | |
Last patch broke libvirt mapping of network info. This fixes it.
| -rw-r--r-- | nova/virt/libvirt/netutils.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py index 8d36c0a05..041eacb2d 100644 --- a/nova/virt/libvirt/netutils.py +++ b/nova/virt/libvirt/netutils.py @@ -91,9 +91,14 @@ def get_network_info(instance): 'broadcast': network['broadcast'], 'mac': vif['address'], 'rxtx_cap': flavor['rxtx_cap'], - 'dns': [network['dns']], + 'dns': [], 'ips': [ip_dict(ip) for ip in network_ips]} + if network['dns1']: + mapping['dns'].append(network['dns1']) + if network['dns2']: + mapping['dns'].append(network['dns2']) + if FLAGS.use_ipv6: mapping['ip6s'] = [ip6_dict()] mapping['gateway6'] = network['gateway_v6'] |