summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Alekseyev <ialekseev@griddynamics.com>2011-03-27 17:15:47 +0000
committerTarmac <>2011-03-27 17:15:47 +0000
commit8501cd94e3929918fdbfe0ca489304449f2f7fe3 (patch)
tree7c551627ace0169f7dcf589b089581735afef2c5
parent9cfaabec414e0a4e8b198d074f3012eff79be5ce (diff)
parentc4167bd6174838d1df3c77094a22b19e592e88c1 (diff)
downloadnova-8501cd94e3929918fdbfe0ca489304449f2f7fe3.tar.gz
nova-8501cd94e3929918fdbfe0ca489304449f2f7fe3.tar.xz
nova-8501cd94e3929918fdbfe0ca489304449f2f7fe3.zip
use_ipv6 now passing to interfaces.template as first level variable in libvirt_conn
-rw-r--r--nova/virt/libvirt_conn.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 5962507d7..36457ee87 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -760,11 +760,12 @@ class LibvirtConnection(driver.ComputeDriver):
'dns': network_ref['dns'],
'address_v6': address_v6,
'gateway_v6': network_ref['gateway_v6'],
- 'netmask_v6': network_ref['netmask_v6'],
- 'use_ipv6': FLAGS.use_ipv6}
+ 'netmask_v6': network_ref['netmask_v6']}
nets.append(net_info)
- net = str(Template(ifc_template, searchList=[{'interfaces': nets}]))
+ net = str(Template(ifc_template,
+ searchList=[{'interfaces': nets,
+ 'use_ipv6': FLAGS.use_ipv6}]))
if key or net:
inst_name = inst['name']