diff options
| author | Mate Lakat <mate.lakat@citrix.com> | 2012-09-25 16:00:31 +0100 |
|---|---|---|
| committer | Mate Lakat <mate.lakat@citrix.com> | 2012-09-25 16:00:31 +0100 |
| commit | 25b2062b471c965170d6ad7b0bdf40338e97d330 (patch) | |
| tree | feaf8f4f396ba74e12ef92f6367cab504f4ad4e8 /plugins | |
| parent | 13a08f6ec7969c4ec6bd4b3bd816bb2a40f9896a (diff) | |
| download | nova-25b2062b471c965170d6ad7b0bdf40338e97d330.tar.gz nova-25b2062b471c965170d6ad7b0bdf40338e97d330.tar.xz nova-25b2062b471c965170d6ad7b0bdf40338e97d330.zip | |
Fix XenServer's ability to boot xen type images
Fixes bug 1055431.
As the scheduler wants to boot a vm_mode=xen type of image, the host's
"supported_instances" capability is used for finding a good candidate.
In the Xapi case, this field was not populated.
This fix modifies the xapi xenhost plugin, so the Xen host capabilities
are returned back to the compute node, as "host_capabilities".
On the compute side, the mentioned information is used, to extract the
"supported_instances" information.
Change-Id: I2da11ab81f74b5b52e2c30832a694470978e21b0
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost index e556931bb..4d2193908 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost @@ -398,7 +398,9 @@ def cleanup(dct): for oc_fld in oc.split("; "): ock, ocv = strip_kv(oc_fld) ocd[ock] = ocv -# out["host_capabilities"] = dct.get("capabilities", "").split("; ") + + capabilities = dct.get("capabilities", "") + out["host_capabilities"] = capabilities.replace(";", "").split() # out["host_allowed-operations"] = dct.get( # "allowed-operations", "").split("; ") # lsrv = dct.get("license-server", "") |