Revision 6b970cef
b/lib/constants.py | ||
---|---|---|
391 | 391 |
HV_DEVICE_MODEL = "device_model" |
392 | 392 |
HV_INIT_SCRIPT = "init_script" |
393 | 393 |
HV_MIGRATION_PORT = "migration_port" |
394 |
HV_USE_LOCALTIME = "use_localtime" |
|
394 | 395 |
|
395 | 396 |
HVS_PARAMETER_TYPES = { |
396 | 397 |
HV_BOOT_ORDER: VTYPE_STRING, |
... | ... | |
416 | 417 |
HV_DEVICE_MODEL: VTYPE_STRING, |
417 | 418 |
HV_INIT_SCRIPT: VTYPE_STRING, |
418 | 419 |
HV_MIGRATION_PORT: VTYPE_INT, |
420 |
HV_USE_LOCALTIME: VTYPE_BOOL, |
|
419 | 421 |
} |
420 | 422 |
|
421 | 423 |
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) |
... | ... | |
623 | 625 |
HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader", |
624 | 626 |
HV_DEVICE_MODEL: "/usr/lib/xen/bin/qemu-dm", |
625 | 627 |
HV_MIGRATION_PORT: 8002, |
628 |
HV_USE_LOCALTIME: False, |
|
626 | 629 |
}, |
627 | 630 |
HT_KVM: { |
628 | 631 |
HV_KERNEL_PATH: "/boot/vmlinuz-2.6-kvmU", |
... | ... | |
642 | 645 |
HV_DISK_TYPE: HT_DISK_PARAVIRTUAL, |
643 | 646 |
HV_USB_MOUSE: '', |
644 | 647 |
HV_MIGRATION_PORT: 8102, |
648 |
HV_USE_LOCALTIME: False, |
|
645 | 649 |
}, |
646 | 650 |
HT_FAKE: { |
647 | 651 |
}, |
b/lib/hypervisor/hv_kvm.py | ||
---|---|---|
73 | 73 |
constants.HV_USB_MOUSE: |
74 | 74 |
hv_base.ParamInSet(False, constants.HT_KVM_VALID_MOUSE_TYPES), |
75 | 75 |
constants.HV_MIGRATION_PORT: hv_base.NET_PORT_CHECK, |
76 |
constants.HV_USE_LOCALTIME: hv_base.NO_CHECK, |
|
76 | 77 |
} |
77 | 78 |
|
78 | 79 |
_MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)', |
... | ... | |
402 | 403 |
else: |
403 | 404 |
kvm_cmd.extend(['-serial', 'none']) |
404 | 405 |
|
406 |
if hvp[constants.HV_USE_LOCALTIME]: |
|
407 |
kvm_cmd.extend(['-localtime']) |
|
408 |
|
|
405 | 409 |
# Save the current instance nics, but defer their expansion as parameters, |
406 | 410 |
# as we'll need to generate executable temp files for them. |
407 | 411 |
kvm_nics = instance.nics |
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
551 | 551 |
constants.HV_DEVICE_MODEL: hv_base.REQ_FILE_CHECK, |
552 | 552 |
constants.HV_VNC_PASSWORD_FILE: hv_base.REQ_FILE_CHECK, |
553 | 553 |
constants.HV_MIGRATION_PORT: hv_base.NET_PORT_CHECK, |
554 |
constants.HV_USE_LOCALTIME: hv_base.NO_CHECK, |
|
554 | 555 |
} |
555 | 556 |
|
556 | 557 |
@classmethod |
... | ... | |
609 | 610 |
config.write("vncpasswd = '%s'\n" % password.rstrip()) |
610 | 611 |
|
611 | 612 |
config.write("serial = 'pty'\n") |
612 |
config.write("localtime = 1\n") |
|
613 |
if hvp[constants.HV_USE_LOCALTIME]: |
|
614 |
config.write("localtime = 1\n") |
|
613 | 615 |
|
614 | 616 |
vif_data = [] |
615 | 617 |
nic_type = hvp[constants.HV_NIC_TYPE] |
Also available in: Unified diff