diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 16:45:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 16:45:03 +0000 |
| commit | 60ea96b288d9d8f29d772dce3763fda466c73040 (patch) | |
| tree | 20756824bd6aed2dcf68f9ff91427be9b218ee65 /nova/virt | |
| parent | fb9abcc83935b01746aeba0db4c431fe72b921fc (diff) | |
| parent | 31336b35b4604f70150d0073d77dbf63b9bf7598 (diff) | |
Merge "Add CPU arch filter scheduler support"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/connection.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 5118ca0be..ba4d90a4a 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -2008,8 +2008,12 @@ class LibvirtDriver(driver.ComputeDriver): for nodes in feature_nodes: features.append(nodes.get('name')) + arch_nodes = xml.findall('.//guest/arch') + guest_cpu_arches = list(node.get('name') for node in arch_nodes) + cpu_info['topology'] = topology cpu_info['features'] = features + cpu_info['permitted_instance_types'] = guest_cpu_arches return jsonutils.dumps(cpu_info) def block_stats(self, instance_name, disk): |