diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-03-29 20:14:29 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-03-29 20:14:29 +0000 |
| commit | c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732 (patch) | |
| tree | eabec10a2f65956ad38e3f9ae00920487c9887bd | |
| parent | cdb006321436de92d790ca97c668c0b725da5d2b (diff) | |
| parent | b161ae983edbd9e8c302907e8951075546eafc48 (diff) | |
| download | nova-c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732.tar.gz nova-c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732.tar.xz nova-c7555d66e5ba4bf1f4eae2edcdedfcb7ffa2d732.zip | |
Now checking that exists at least one network marked injected (libvirt and xenapi)
| -rw-r--r-- | nova/virt/libvirt_conn.py | 9 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index ae3a967a4..c144e827e 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -817,6 +817,7 @@ class LibvirtConnection(driver.ComputeDriver): nets = [] ifc_template = open(FLAGS.injected_network_template).read() ifc_num = -1 + have_injected_networks = False admin_context = context.get_admin_context() for (network_ref, mapping) in network_info: ifc_num += 1 @@ -824,6 +825,7 @@ class LibvirtConnection(driver.ComputeDriver): if not 'injected' in network_ref: continue + have_injected_networks = True address = mapping['ips'][0]['ip'] address_v6 = None if FLAGS.use_ipv6: @@ -839,9 +841,10 @@ class LibvirtConnection(driver.ComputeDriver): 'netmask_v6': network_ref['netmask_v6']} nets.append(net_info) - net = str(Template(ifc_template, - searchList=[{'interfaces': nets, - 'use_ipv6': FLAGS.use_ipv6}])) + if have_injected_networks: + net = str(Template(ifc_template, + searchList=[{'interfaces': nets, + 'use_ipv6': FLAGS.use_ipv6}])) if key or net: inst_name = inst['name'] diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 2288ea8a5..d07d60800 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1108,11 +1108,13 @@ def _prepare_injectables(inst, networks_info): if networks_info: ifc_num = -1 interfaces_info = [] + have_injected_networks = False for (network_ref, info) in networks_info: ifc_num += 1 if not network_ref['injected']: continue + have_injected_networks = True ip_v4 = ip_v6 = None if 'ips' in info and len(info['ips']) > 0: ip_v4 = info['ips'][0] @@ -1131,7 +1133,9 @@ def _prepare_injectables(inst, networks_info): 'gateway_v6': ip_v6 and ip_v6['gateway'] or '', 'use_ipv6': FLAGS.use_ipv6} interfaces_info.append(interface_info) - net = str(template(template_data, - searchList=[{'interfaces': interfaces_info, - 'use_ipv6': FLAGS.use_ipv6}])) + + if have_injected_networks: + net = str(template(template_data, + searchList=[{'interfaces': interfaces_info, + 'use_ipv6': FLAGS.use_ipv6}])) return key, net |