summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-01 23:35:44 +0000
committerGerrit Code Review <review@openstack.org>2012-02-01 23:35:44 +0000
commit6ee7c132d768e44193a6aa0ee0cc66815e7dced0 (patch)
treeed6155ec4056420cdf1374b0fca61ee9726d115f
parent256620786fd8c8171412dd0543e66a5d4ad71882 (diff)
parent67a419de2d16b83a4ab53431b1ed3fb83abd9eac (diff)
downloadnova-6ee7c132d768e44193a6aa0ee0cc66815e7dced0.tar.gz
nova-6ee7c132d768e44193a6aa0ee0cc66815e7dced0.tar.xz
nova-6ee7c132d768e44193a6aa0ee0cc66815e7dced0.zip
Merge "Improve dom0 and template VM avoidance."
-rw-r--r--nova/virt/xenapi/vmops.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 660191999..f3ff9a22d 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1388,7 +1388,7 @@ class VMOps(object):
for vrec in vm_rec['VIFs']]:
vif_map[vif['device']] = vif['MAC']
name = vm_rec['name_label']
- if name.startswith('Control domain'):
+ if vm_rec["is_a_template"] or vm_rec["is_control_domain"]:
continue
vifs_bw = bw.setdefault(name, {})
for key, val in data.iteritems():