Francesco Romani has posted comments on this change.
Change subject: core: removing CR char after encoding
......................................................................
Patch Set 5:
additional verification (as pointed out by Omer).
Both hosts with XML-RPC, seems fine, no \r\n or combination thereof
SRC:
Thread-13::DEBUG::2014-10-21 14:53:46,123::BindingXMLRPC::1154::vds::(wrapper)
client [192.168.1.176]::call vmCreate with ({'acpiEnable': 'true',
'emulatedMachine': 'rhel6.5.0', 'vmId': '500864d1-028c-494c-80d9-b87c15d35971',
'memGuaranteedSize': 1024, 'transparentHugePages': 'true',
'spiceSslCipherSuite': 'DEFAULT', 'cpuType': 'SandyBridge', 'smp': '1',
'numaTune': {'nodeset': '0', 'mode': 'interleave'}, 'custom': {}, 'vmType':
'kvm', 'memSize': 1024, 'smpCoresPerSocket': '1', 'vmName': 'c', 'nice': '0',
'bootMenuEnable': 'false', 'copyPasteEnable': 'true', 'smartcardEnable':
'false', 'fileTransferEnable': 'true', 'keyboardLayout': 'en-us', 'kvmEnable':
'true', 'displayNetwork': 'ovirtmgmt', 'devices': [{'index': '3', 'iface':
'ide', 'specParams': {'vmPayload': {'volId': 'config-2', 'file':
{'openstack/latest/meta_data.json':
'ewogICJsYXVuY2hfaW5kZXgiIDogIjAiLAogICJhdmFpbGFiaWxpdHlfem9uZSIgOiAibm92YSIsCiAgInV1aWQiIDogImFmMzM3MzU4LTNkZTktNDQ0My1iZDU4LTE5ZDE4ZThhYzc2NCIsCiAgI!
m1ldGEiIDogewogICAgImVzc2VudGlhbCIgOiAiZmFsc2UiLAogICAgInJvbGUiIDogInNlcnZlciIsCiAgICAiZHNtb2RlIiA6ICJsb2NhbCIKICB9Cn0=',
'openstack/latest/user_data':
'I2Nsb3VkLWNvbmZpZwpzc2hfcHdhdXRoOiB0cnVlCmRpc2FibGVfcm9vdDogMApvdXRwdXQ6CiAgYWxsOiAnPj4gL3Zhci9sb2cvY2xvdWQtaW5pdC1vdXRwdXQubG9nJwpjaHBhc3N3ZDoKICBleHBpcmU6IGZhbHNlCnJ1bmNtZDoKLSAnc2VkIC1pICcnL15kYXRhc291cmNlX2xpc3Q6IC9kJycgL2V0Yy9jbG91ZC9jbG91ZC5jZmc7IGVjaG8gJydkYXRhc291cmNlX2xpc3Q6CiAgWyJOb0Nsb3VkIiwgIkNvbmZpZ0RyaXZlIl0nJyA+PiAvZXRjL2Nsb3VkL2Nsb3VkLmNmZycK'}}},
'readonly': 'true', 'deviceId': '118dd4ba-04b7-4909-994c-9e54a039654f',
'path': '', 'device': 'cdrom', 'shared': 'false', 'type': 'disk'}, {'device':
'qxl', 'specParams': {'vram': '32768', 'heads': '1'}, 'type': 'video',
'deviceId': 'a1bc8050-0362-4c53-ab03-60a4fc923c2f'}, {'index': '2', 'iface':
'ide', 'specParams': {'path': ''}, 'readonly': 'true', 'deviceId':
'104e2a88-05e6-47d5-800a-1ca3a08e4e4f', 'path': '', 'device': 'cdrom',
'shared': 'false', 'type': 'disk'!
}, {'index': 0, 'iface': 'virtio', 'format': 'raw', 'bootOrder': '1',
'volumeID': 'af65c617-b003-497c-aea1-3fffcd6f9e56', 'imageID':
'e4fc4a3f-d804-4656-a5e6-9db6b9c7d9f1', 'specParams': {}, 'readonly': 'false',
'domainID': 'f3b719f6-b24b-45d4-920a-1e333b3814e2', 'optional': 'false',
'deviceId': 'e4fc4a3f-d804-4656-a5e6-9db6b9c7d9f1', 'poolID':
'00000002-0002-0002-0002-00000000023d', 'device': 'disk', 'shared': 'false',
'propagateErrors': 'off', 'type': 'disk'}, {'nicModel': 'pv', 'macAddr':
'00:1a:4a:71:2e:02', 'linkActive': 'true', 'network': 'ovirtmgmt', 'bootOrder':
'2', 'filter': 'vdsm-no-mac-spoofing', 'specParams': {'inbound': {},
'outbound': {}}, 'deviceId': '8df245dd-322a-4cb7-af0f-fda0ebc2d72c', 'device':
'bridge', 'type': 'interface'}, {'device': 'memballoon', 'specParams':
{'model': 'virtio'}, 'type': 'balloon', 'deviceId':
'ef8d1a0b-575d-4afb-b5d5-77c12f1d898f'}, {'index': '0', 'specParams': {},
'deviceId': 'a3fd2bb3-e667-4d81-973d-b37723fc8ceb', 'device': 'scsi
', 'model': 'virtio-scsi', 'type': 'controller'}, {'device': 'virtio-s!
erial', 'specParams': {}, 'type': 'controller', 'deviceId':
'8f09b239-ee62-4524-91a1-30970bfb759f'}], 'timeOffset': '0', 'maxVCpus': '16',
'spiceSecureChannels':
'smain,sinputs,scursor,splayback,srecord,sdisplay,susbredir,ssmartcard',
'display': 'qxl'},) {} flowID [2aacbe31]
DST:
Thread-73::DEBUG::2014-10-21 15:00:23,933::BindingXMLRPC::1161::vds::(wrapper)
return vmMigrationCreate with {'status': {'message': 'Done', 'code': 0},
'migrationPort': 0, 'params': {'guestFQDN': '', 'acpiEnable': 'true',
'emulatedMachine': 'rhel6.5.0', 'afterMigrationStatus': '',
'spiceSecureChannels':
'smain,sinputs,scursor,splayback,srecord,sdisplay,susbredir,ssmartcard', 'pid':
'0', 'memGuaranteedSize': 1024, 'transparentHugePages': 'true',
'displaySecurePort': '-1', 'spiceSslCipherSuite': 'DEFAULT', 'cpuType':
'SandyBridge', 'custom': {}, 'pauseCode': 'NOERR', 'migrationDest': 'libvirt',
'numaTune': {'nodeset': '0', 'mode': 'interleave'}, 'smp': '1', 'vmType':
'kvm', 'memSize': 1024, 'smpCoresPerSocket': '1', 'vmName': 'c', 'nice': '0',
'username': 'Unknown', 'bootMenuEnable': 'false', 'guestDiskMapping': {},
'vmId': '500864d1-028c-494c-80d9-b87c15d35971', 'copyPasteEnable': 'true',
'displayIp': '192.168.1.40', 'displayPort': '-1', 'smartcardEnable': 'false',
'clientIp'!
: '', 'fileTransferEnable': 'true', 'nicModel': 'rtl8139,pv',
'keyboardLayout': 'en-us', 'kvmEnable': 'true', 'displayNetwork': 'ovirtmgmt',
'devices': [{'target': 1048576, 'specParams': {'model': 'virtio'}, 'alias':
'balloon0', 'deviceId': 'ef8d1a0b-575d-4afb-b5d5-77c12f1d898f', 'address':
{'slot': '0x07', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function':
'0x0'}, 'device': 'memballoon', 'type': 'balloon'}, {'index': '0', 'alias':
'scsi0', 'specParams': {}, 'deviceId': 'a3fd2bb3-e667-4d81-973d-b37723fc8ceb',
'address': {'slot': '0x04', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci',
'function': '0x0'}, 'device': 'scsi', 'model': 'virtio-scsi', 'type':
'controller'}, {'specParams': {}, 'alias': 'virtio-serial0', 'deviceId':
'8f09b239-ee62-4524-91a1-30970bfb759f', 'address': {'slot': '0x05', 'bus':
'0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x0'}, 'device':
'virtio-serial', 'type': 'controller'}, {'specParams': {'vram': '32768',
'heads': '1'}, 'alia!
s': 'video0', 'deviceId': 'a1bc8050-0362-4c53-ab03-60a4fc923c2f', 'address':
{'slot': '0x02', 'bus': '0x00', 'domain': '0x0000', 'type': 'pci', 'function':
'0x0'}, 'device': 'qxl', 'type': 'video'}, {'device': 'spice', 'specParams':
{'displayNetwork': 'ovirtmgmt', 'spiceSecureChannels':
'smain,sinputs,scursor,splayback,srecord,sdisplay,susbredir,ssmartcard',
'keyMap': 'en-us', 'displayIp': '192.168.1.40', 'copyPasteEnable': 'true'},
'type': 'graphics', 'port': '5900', 'tlsPort': '5901'}, {'nicModel': 'pv',
'macAddr': '00:1a:4a:71:2e:02', 'linkActive': True, 'network': 'ovirtmgmt',
'specParams': {'inbound': {}, 'outbound': {}}, 'bootOrder': '2', 'filter':
'vdsm-no-mac-spoofing', 'alias': 'net0', 'deviceId':
'8df245dd-322a-4cb7-af0f-fda0ebc2d72c', 'address': {'slot': '0x03', 'bus':
'0x00', 'domain': '0x0000', 'type': 'pci', 'function': '0x0'}, 'device':
'bridge', 'type': 'interface', 'name': 'vnet0'}, {'index': '3', 'iface': 'ide',
'name': 'hdd', 'alias': 'ide0-1-1', 'shared':
'false', 'specParams': {'vmPayload': {'volId': 'config-2', 'file': {'!
openstack/latest/meta_data.json':
'ewogICJsYXVuY2hfaW5kZXgiIDogIjAiLAogICJhdmFpbGFiaWxpdHlfem9uZSIgOiAibm92YSIsCiAgInV1aWQiIDogImFmMzM3MzU4LTNkZTktNDQ0My1iZDU4LTE5ZDE4ZThhYzc2NCIsCiAgIm1ldGEiIDogewogICAgImVzc2VudGlhbCIgOiAiZmFsc2UiLAogICAgInJvbGUiIDogInNlcnZlciIsCiAgICAiZHNtb2RlIiA6ICJsb2NhbCIKICB9Cn0=',
'openstack/latest/user_data':
'I2Nsb3VkLWNvbmZpZwpzc2hfcHdhdXRoOiB0cnVlCmRpc2FibGVfcm9vdDogMApvdXRwdXQ6CiAgYWxsOiAnPj4gL3Zhci9sb2cvY2xvdWQtaW5pdC1vdXRwdXQubG9nJwpjaHBhc3N3ZDoKICBleHBpcmU6IGZhbHNlCnJ1bmNtZDoKLSAnc2VkIC1pICcnL15kYXRhc291cmNlX2xpc3Q6IC9kJycgL2V0Yy9jbG91ZC9jbG91ZC5jZmc7IGVjaG8gJydkYXRhc291cmNlX2xpc3Q6CiAgWyJOb0Nsb3VkIiwgIkNvbmZpZ0RyaXZlIl0nJyA+PiAvZXRjL2Nsb3VkL2Nsb3VkLmNmZycK'}}},
'readonly': 'True', 'deviceId': '118dd4ba-04b7-4909-994c-9e54a039654f',
'address': {'bus': '1', 'controller': '0', 'type': 'drive', 'target': '0',
'unit': '1'}, 'device': 'cdrom', 'path':
'/var/run/vdsm/payload/500864d1-028c-494c-80d9-b87c15d35971.1de4d784a881b948408b079e284fb203.img'!
, 'type': 'disk'}
no mangling of the cloud-init data:
GENji> 15:02:37 root [~]$ mount -o ro,loop
/var/run/vdsm/payload/500864d1-028c-494c-80d9-b87c15d35971.1de4d784a881b948408b079e284fb203.img
/mnt/image/
GENji> 15:02:44 root [~]$ cat /m
media/ misc/ mnt/
GENji> 15:02:44 root [~]$ cat /m
media/ misc/ mnt/
GENji> 15:02:44 root [~]$ cat /mnt/image/openstack/latest/
meta_data.json user_data
GENji> 15:02:44 root [~]$ cat /mnt/image/openstack/latest/user_data
#cloud-config
ssh_pwauth: true
disable_root: 0
output:
all: '>> /var/log/cloud-init-output.log'
chpasswd:
expire: false
runcmd:
- 'sed -i ''/^datasource_list: /d'' /etc/cloud/cloud.cfg; echo
''datasource_list:
["NoCloud", "ConfigDrive"]'' >> /etc/cloud/cloud.cfg'
--
To view, visit http://gerrit.ovirt.org/34201
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I2c11ec26e25cf39084a889ec475f400a8318e5eb
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <[email protected]>
Gerrit-Reviewer: Francesco Romani <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Piotr Kliczewski <[email protected]>
Gerrit-Reviewer: Shahar Havivi <[email protected]>
Gerrit-Reviewer: [email protected]
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: No
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
