diff options
| author | Koji Iida <iida.koji@lab.ntt.co.jp> | 2011-03-16 21:17:19 +0900 |
|---|---|---|
| committer | Koji Iida <iida.koji@lab.ntt.co.jp> | 2011-03-16 21:17:19 +0900 |
| commit | 2e81ce6bb5b1083220e7ae5c17113fd44465ddbf (patch) | |
| tree | 106eeffd56c7fd797a973496043103fcbc9b6c9d /nova | |
| parent | 8964cbecc10885bc6eff08544d62db1747fb14ef (diff) | |
Fix instance creation fail under use_ipv6=false and FlatManager
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/libvirt_conn.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 9efbb3342..a850bad87 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -660,11 +660,10 @@ class LibvirtConnection(object): if network_ref['injected']: admin_context = context.get_admin_context() address = db.instance_get_fixed_address(admin_context, inst['id']) - address_v6 = db.instance_get_fixed_address_v6(admin_context, - inst['id']) - gateway_v6 = network_ref['gateway_v6'] - if not gateway_v6: - gateway_v6 = "fd00::" + address_v6 = None + if FLAGS.use_ipv6: + address_v6 = db.instance_get_fixed_address_v6(admin_context, + inst['id']) interfaces_info = {'address': address, 'netmask': network_ref['netmask'], |