mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 05:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #817 from bgilbert/vmware

Browse Source 
build_library: update VMware virtual hardware version to 11
This commit is contained in:
Benjamin Gilbert 2018-05-29 14:42:13 -04:00 committed by GitHub
commit 1bd0c0cd94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_library/template_vmware.ovf
View File

@ -93,7 +93,7 @@
<vssd:ElementName>Virtual Hardware Family</vssd:ElementName> <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
<vssd:InstanceID>0</vssd:InstanceID> <vssd:InstanceID>0</vssd:InstanceID>
<vssd:VirtualSystemIdentifier>@@NAME@@</vssd:VirtualSystemIdentifier> <vssd:VirtualSystemIdentifier>@@NAME@@</vssd:VirtualSystemIdentifier>
<vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType> <vssd:VirtualSystemType>vmx-11</vssd:VirtualSystemType>
</System> </System>
<Item> <Item>
<rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits> <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
@ -191,12 +191,12 @@
<rasd:ResourceType>10</rasd:ResourceType> <rasd:ResourceType>10</rasd:ResourceType>
<vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="true"/> <vmw:Config ovf:required="false" vmw:key="wakeOnLanEnabled" vmw:value="true"/>
</Item> </Item>
<vmw:Config ovf:required="false" vmw:key="cpuHotAddEnabled" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="cpuHotAddEnabled" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="cpuHotRemoveEnabled" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="cpuHotRemoveEnabled" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="bios"/> <vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="bios"/>
<vmw:Config ovf:required="false" vmw:key="virtualICH7MPresent" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="virtualICH7MPresent" vmw:value="false"/>
<vmw:Config ovf:required="false" vmw:key="virtualSMCPresent" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="virtualSMCPresent" vmw:value="false"/>
<vmw:Config ovf:required="false" vmw:key="memoryHotAddEnabled" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="memoryHotAddEnabled" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="nestedHVEnabled" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="nestedHVEnabled" vmw:value="false"/>
<vmw:Config ovf:required="false" vmw:key="powerOpInfo.powerOffType" vmw:value="preset"/> <vmw:Config ovf:required="false" vmw:key="powerOpInfo.powerOffType" vmw:value="preset"/>
<vmw:Config ovf:required="false" vmw:key="powerOpInfo.resetType" vmw:value="preset"/> <vmw:Config ovf:required="false" vmw:key="powerOpInfo.resetType" vmw:value="preset"/>

5
build_library/vm_image_util.sh
View File

@ -788,7 +788,7 @@ _write_vmx_conf() {
#!/usr/bin/vmware #!/usr/bin/vmware
.encoding = "UTF-8" .encoding = "UTF-8"
config.version = "8" config.version = "8"
virtualHW.version = "7" virtualHW.version = "11"
cleanShutdown = "TRUE" cleanShutdown = "TRUE"
displayName = "${VM_NAME}" displayName = "${VM_NAME}"
ethernet0.addressType = "generated" ethernet0.addressType = "generated"
@ -822,6 +822,9 @@ pciBridge6.functions = "8"
pciBridge7.present = "TRUE" pciBridge7.present = "TRUE"
pciBridge7.virtualDev = "pcieRootPort" pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8" pciBridge7.functions = "8"
hpet0.present = "TRUE"
vcpu.hotadd = "TRUE"
mem.hotadd = "TRUE"
EOF EOF
# Only upload the vmx if it won't be bundled # Only upload the vmx if it won't be bundled
if [[ -z "$(_get_vm_opt BUNDLE_FORMAT)" ]]; then if [[ -z "$(_get_vm_opt BUNDLE_FORMAT)" ]]; then