Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Linux] Collect Linux OVA configs at OVA deployment #423

Merged
merged 9 commits into from
Feb 13, 2023

Conversation

keirazhang
Copy link
Contributor

Fix #418
Changes include:

  1. Collected CDROMs, USBs, Video card information in common/collect_ovf_vm_config.yml
  2. Tasks in linux/deploy_vm/amazonlinux/reconfigure_amazonlinux_vm.yml and linux/deploy_vm/photon/reconfigure_photon_vm.yml are almost same except for the variables for create seed ISO. And Ubuntu OVA deployment also includes these tasks in linux/deploy_vm/ubuntu/reconfigure_ubuntu_ova_vm.yml, except that Ubuntu OVA needs an extra serial port and CDROM. So here removed redundant tasks files and use a united tasks file linux/deploy_vm/reconfigure_vm_with_cloudinit.yml.
  3. Amazon Linux post configs were moved into its cloud-init user data, which can be completed at cloud-init config.

Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
@keirazhang keirazhang added this to the v2.3 milestone Feb 9, 2023
Signed-off-by: Qi Zhang <qiz@vmware.com>
@keirazhang keirazhang changed the title [Linux] Collect Linux OVAconfigs at OVA deployment [Linux] Collect Linux OVA configs at OVA deployment Feb 9, 2023
@keirazhang
Copy link
Contributor Author

keirazhang commented Feb 9, 2023


  - 'Guest os distribution: VMware Photon OS 4.0 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: vmwarePhoton64Guest'
  - 'Guestinfo guest id: vmwarePhoton64Guest'
  - 'Guestinfo guest full name: VMware Photon OS (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' distroName=''VMware
    Photon OS'' distroVersion=''4.0'' familyName=''Linux'' kernelVersion=''5.10.83-6.ph4-esx''
    prettyName=''VMware Photon OS/Linux'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_photon_ova...............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

  - 'Guest os distribution: Amazon 2 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: other3xLinux64Guest'
  - 'Guestinfo guest id: amazonlinux2_64Guest'
  - 'Guestinfo guest full name: Amazon Linux 2 (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' distroName=''Amazon
    Linux'' distroVersion=''2'' familyName=''Linux'' kernelVersion=''4.14.301-224.520.amzn2.x86_64''
    prettyName=''Amazon Linux 2'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_amazon_ova...............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

  - 'Guest os distribution: Flatcar 3374.2.3 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: other3xLinux64Guest'
  - 'Guestinfo guest id: other5xLinux64Guest'
  - 'Guestinfo guest full name: Other 5.x Linux (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' buildNumber=''2023-01-20-1751''
    distroName=''Flatcar Container Linux by Kinvolk'' distroVersion=''3374.2.3'' familyName=''Linux''
    kernelVersion=''5.15.86-flatcar'' prettyName=''Flatcar Container Linux by Kinvolk
    3374.2.3 (Oklo)'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_flatcar_ova..............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

  - 'Guest os distribution: Ubuntu 22.04 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: ubuntu64Guest'
  - 'Guestinfo guest id: ubuntu64Guest'
  - 'Guestinfo guest full name: Ubuntu Linux (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' distroName=''Ubuntu
    22.04 LTS'' distroVersion=''22.04'' familyName=''Linux'' kernelVersion=''5.15.0-25-generic''
    prettyName=''Ubuntu 22.04 LTS'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_ubuntu_ova...............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

  - 'Guest os distribution: Ubuntu 22.10 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: ubuntu64Guest'
  - 'Guestinfo guest id: ubuntu64Guest'
  - 'Guestinfo guest full name: Ubuntu Linux (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' distroName=''Ubuntu
    22.10'' distroVersion=''22.10'' familyName=''Linux'' kernelVersion=''5.19.0-21-generic''
    prettyName=''Ubuntu 22.10'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_ubuntu_ova...............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

  - 'Guest os distribution: Ubuntu 20.04 x86_64'
  - 'Hardware version: vmx-20'
  - 'Config guest id: ubuntu64Guest'
  - 'Guestinfo guest id: ubuntu64Guest'
  - 'Guestinfo guest full name: Ubuntu Linux (64-bit)'
  - 'Guestinfo guest family: linuxGuest'
  - 'Guestinfo detailed data: architecture=''X86'' bitness=''64'' distroName=''Ubuntu''
    distroVersion=''20.04'' familyName=''Linux'' kernelVersion=''5.4.0-125-generic''
    prettyName=''Ubuntu 20.04.4 LTS'''
  - 'Results: Total (2), Passed (2)'
  - ' * deploy_ubuntu_ova...............................................Passed'
  - ' * check_inbox_driver..............................................Passed'

Windows

[
    {
        "CDROMs": [
            {
                "Controller": "IDE 1",
                "Label": "CD/DVD drive 1"
            },
            {
                "Controller": "IDE 0",
                "Label": "CD/DVD drive 2"
            }
        ],
        "CPU Cores per Socket": 1,
        "CPU Hot Add Enabled": false,
        "CPU I/O MMU": false,
        "CPU Nested HV Enabled": true,
        "CPU Number": 4,
        "Disks": [
            {
                "Controller": "LSI Logic SAS",
                "Disk Size in GB": 125.0,
                "Label": "Hard disk 1",
                "Thin Provisioned": true
            }
        ],
        "Firmware": "efi",
        "Guest OS Distribution": "Windows 11 Enterprise, 64-bit (Build 22621.1105)",
        "Guest OS ID": "windows9_64Guest",
        "Guest OS Version": "Microsoft Windows 10 (64-bit)",
        "Hardware Version": "vmx-19",
        "Hardware Version Product Compatibility": "hosted",
        "Memory Hot Add Enabled": false,
        "Memory Size in MB": 4096,
        "Network Adapters": [
            {
                "Label": "Network adapter 1",
                "Type": "E1000"
            },
            {
                "Label": "Network adapter 2",
                "Type": "E1000"
            }
        ],
        "Secure Boot": true,
        "USB Controllers": [],
        "VBS Enabled": false,
        "VMware Tools": {
            "Install Type": "guestToolsTypeMSI",
            "Sync Time with Host": true,
            "Upgrade Policy": "upgradeAtPowerCycle",
            "Version": "12.0.6 (build-20104755)"
        },
        "Video Card": {
            "3D Memory Size in MB": 256.0,
            "3D Renderer": "automatic",
            "Auto-detect Settings": false,
            "Enable 3D Support": false,
            "Number of Displays": 1,
            "Video RAM Size in MB": 256.0
        },
        "Virtual HPET": true,
        "Virtual TPM": false
    }
]

Ubuntu 22.04

[
    {
        "CDROMs": [],
        "CPU Cores per Socket": 1,
        "CPU Hot Add Enabled": false,
        "CPU I/O MMU": false,
        "CPU Nested HV Enabled": false,
        "CPU Number": 2,
        "Disks": [
            {
                "Controller": "VMware paravirtual SCSI",
                "Disk Size in GB": 10.0,
                "Label": "Hard disk 1",
                "Thin Provisioned": true
            }
        ],
        "Firmware": "bios",
        "Guest OS Distribution": "Ubuntu 22.04 LTS",
        "Guest OS ID": "ubuntu64Guest",
        "Guest OS Version": "Ubuntu Linux (64-bit)",
        "Hardware Version": "vmx-10",
        "Hardware Version Product Compatibility": "",
        "Kernel Version": "5.15.0-25-generic",
        "Memory Hot Add Enabled": false,
        "Memory Size in MB": 1024,
        "Network Adapters": [
            {
                "Label": "Network adapter 1",
                "Type": "VMXNET3"
            }
        ],
        "Secure Boot": false,
        "USB Controllers": [],
        "VBS Enabled": false,
        "VMware Tools": {
            "Install Type": "guestToolsTypeOpenVMTools",
            "Sync Time with Host": false,
            "Upgrade Policy": "manual",
            "Version": "11.3.5 (build-18557794)"
        },
        "Video Card": {
            "3D Memory Size in MB": 256.0,
            "3D Renderer": "automatic",
            "Auto-detect Settings": false,
            "Enable 3D Support": false,
            "Number of Displays": 1,
            "Video RAM Size in MB": 4.0
        },
        "Virtual HPET": true,
        "Virtual TPM": false
    }
]

Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
Signed-off-by: Qi Zhang <qiz@vmware.com>
Copy link
Member

@Tomorrow9 Tomorrow9 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@keirazhang keirazhang merged commit 93cc0bd into vmware:main Feb 13, 2023
@keirazhang keirazhang deleted the collect_ovf_configs branch March 7, 2023 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[New Feature] Collect OVF configs for Linux OVA deploy
2 participants