From 2e81ce6bb5b1083220e7ae5c17113fd44465ddbf Mon Sep 17 00:00:00 2001 From: Koji Iida Date: Wed, 16 Mar 2011 21:17:19 +0900 Subject: Fix instance creation fail under use_ipv6=false and FlatManager --- nova/virt/libvirt_conn.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'nova') 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'], -- cgit