Revision b6cd72b2 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
6256 | 6256 |
that declares them. |
6257 | 6257 |
|
6258 | 6258 |
""" |
6259 |
self.op.os_type = einfo.get(constants.INISECT_EXP, "os") |
|
6260 |
|
|
6259 | 6261 |
if self.op.disk_template is None: |
6260 | 6262 |
if einfo.has_option(constants.INISECT_INS, "disk_template"): |
6261 | 6263 |
self.op.disk_template = einfo.get(constants.INISECT_INS, |
... | ... | |
6339 | 6341 |
|
6340 | 6342 |
# check hypervisor parameter syntax (locally) |
6341 | 6343 |
utils.ForceDictType(self.op.hvparams, constants.HVS_PARAMETER_TYPES) |
6342 |
filled_hvp = objects.FillDict(cluster.hvparams[self.op.hypervisor], |
|
6344 |
filled_hvp = objects.FillDict(cluster.GetHVDefaults(self.op.hypervisor, |
|
6345 |
self.op.os_type), |
|
6343 | 6346 |
self.op.hvparams) |
6344 | 6347 |
hv_type = hypervisor.GetHypervisor(self.op.hypervisor) |
6345 | 6348 |
hv_type.CheckParameterSyntax(filled_hvp) |
... | ... | |
6454 | 6457 |
(instance_disks, export_disks), |
6455 | 6458 |
errors.ECODE_INVAL) |
6456 | 6459 |
|
6457 |
self.op.os_type = export_info.get(constants.INISECT_EXP, 'os') |
|
6458 | 6460 |
disk_images = [] |
6459 | 6461 |
for idx in range(export_disks): |
6460 | 6462 |
option = 'disk%d_dump' % idx |
Also available in: Unified diff