diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 07:35:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 07:35:54 +0000 |
| commit | 2377d6a7b6b275febdf57b345c72a402254eb925 (patch) | |
| tree | ac9f76f56446b454df529ec3b29a5b2aca9dafb7 /plugins/xenserver | |
| parent | 62e49b5ec465995e7284f822163beb90c39d48ba (diff) | |
| parent | 25b2062b471c965170d6ad7b0bdf40338e97d330 (diff) | |
| download | nova-2377d6a7b6b275febdf57b345c72a402254eb925.tar.gz nova-2377d6a7b6b275febdf57b345c72a402254eb925.tar.xz nova-2377d6a7b6b275febdf57b345c72a402254eb925.zip | |
Merge "Fix XenServer's ability to boot xen type images"
Diffstat (limited to 'plugins/xenserver')
| -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", "") |