diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-08 12:35:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-08 12:35:12 +0000 |
| commit | b0998792222bd3aede65feeb32d1c2d6e6f8080b (patch) | |
| tree | 48c32179ce0e0d6aa4ebde482fd1657df040cc56 | |
| parent | 6a080df6bd8817019d204e3142a236b7974f7656 (diff) | |
| parent | 6de51fc650432a359b0de3cd511f51a9c25cb0c4 (diff) | |
| download | nova-b0998792222bd3aede65feeb32d1c2d6e6f8080b.tar.gz nova-b0998792222bd3aede65feeb32d1c2d6e6f8080b.tar.xz nova-b0998792222bd3aede65feeb32d1c2d6e6f8080b.zip | |
Merge "Fixed image filter support for vmware"
| -rw-r--r-- | nova/virt/vmwareapi/host.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/virt/vmwareapi/host.py b/nova/virt/vmwareapi/host.py index 9d11901d6..95d86311c 100644 --- a/nova/virt/vmwareapi/host.py +++ b/nova/virt/vmwareapi/host.py @@ -1,5 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 - +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2012 VMware, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -135,6 +135,8 @@ class HostState(object): data["hypervisor_type"] = summary.config.product.name data["hypervisor_version"] = summary.config.product.version data["hypervisor_hostname"] = self._host_name + data["supported_instances"] = [('i686', 'vmware', 'hvm'), + ('x86_64', 'vmware', 'hvm')] self._stats = data return data |