From eed5204ed5a92b9fec31bd7645a762453b98c034 Mon Sep 17 00:00:00 2001 From: sig9 Date: Wed, 14 Aug 2024 15:55:32 +0900 Subject: [PATCH] Add Windows Server 2022. --- .../{Server 2019 => Server2019}/Readme.md | 14 ++++- .../win2019.yaml} | 12 +++- .../microsoft/Server2022/Readme.md | 22 ++++++++ .../microsoft/Server2022/win2022.yaml | 56 +++++++++++++++++++ .../{Windows 10 => Windows10}/Readme.md | 4 +- .../Windows 10.yaml => Windows10/win10.yaml} | 15 ++++- .../microsoft/win2019/win2019.yaml | 8 +++ .../microsoft/win2022/win2022.yaml | 8 +++ 8 files changed, 129 insertions(+), 10 deletions(-) rename node-definitions/microsoft/{Server 2019 => Server2019}/Readme.md (52%) rename node-definitions/microsoft/{Server 2019/winServer2019.yaml => Server2019/win2019.yaml} (80%) create mode 100644 node-definitions/microsoft/Server2022/Readme.md create mode 100644 node-definitions/microsoft/Server2022/win2022.yaml rename node-definitions/microsoft/{Windows 10 => Windows10}/Readme.md (86%) rename node-definitions/microsoft/{Windows 10/Windows 10.yaml => Windows10/win10.yaml} (81%) create mode 100644 virl-base-images/microsoft/win2019/win2019.yaml create mode 100644 virl-base-images/microsoft/win2022/win2022.yaml diff --git a/node-definitions/microsoft/Server 2019/Readme.md b/node-definitions/microsoft/Server2019/Readme.md similarity index 52% rename from node-definitions/microsoft/Server 2019/Readme.md rename to node-definitions/microsoft/Server2019/Readme.md index 6a4ddd9..aedee83 100644 --- a/node-definitions/microsoft/Server 2019/Readme.md +++ b/node-definitions/microsoft/Server2019/Readme.md @@ -2,13 +2,21 @@ This directory contains the following node definition: -* `winServer2019.yaml` - Microsoft Windows Server 2019 node definition +* `win2019.yaml` - Microsoft Windows Server 2019 node definition ### Image Availability VHD images can be downloaded from microsoft on a trial basis here: https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2019 -Then the VHD image will have to be converted to a .qcow2 format. Linux qumu-img makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html +Then the VHD image will have to be converted to a .qcow2 format. Linux qumu-img makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html + +For example: + +```sh +qemu-img convert -f vpc -O qcow2 \ + 17763.737.amd64fre.rs5_release_svc_refresh.190906-2324_server_serverdatacentereval_en-us_1.vhd \ + 17763.737.amd64fre.rs5_release_svc_refresh.190906-2324_server_serverdatacentereval_en-us_1.qcow2 +``` ### Notes -This node definition uses 16g of RAM and 4vcpu's. Anything less than that and it tends to become buggy. +This node definition uses 16g of RAM and 4vcpu's. Anything less than that and it tends to become buggy. diff --git a/node-definitions/microsoft/Server 2019/winServer2019.yaml b/node-definitions/microsoft/Server2019/win2019.yaml similarity index 80% rename from node-definitions/microsoft/Server 2019/winServer2019.yaml rename to node-definitions/microsoft/Server2019/win2019.yaml index 650a1df..a6f136c 100644 --- a/node-definitions/microsoft/Server 2019/winServer2019.yaml +++ b/node-definitions/microsoft/Server2019/win2019.yaml @@ -1,5 +1,6 @@ id: win2019 general: + description: Windows Server 2019 nature: server read_only: false device: @@ -7,13 +8,20 @@ device: has_loopback_zero: false physical: - eth0 + - eth1 + - eth2 + - eth3 + - eth4 + - eth5 + - eth6 + - eth7 serial_ports: 1 default_count: 1 ui: visible: true - label_prefix: win2019 + label_prefix: win2019- icon: server - label: win2019 + label: Windows Server 2019 sim: linux_native: libvirt_domain_driver: kvm diff --git a/node-definitions/microsoft/Server2022/Readme.md b/node-definitions/microsoft/Server2022/Readme.md new file mode 100644 index 0000000..c5c665b --- /dev/null +++ b/node-definitions/microsoft/Server2022/Readme.md @@ -0,0 +1,22 @@ +# Microsoft Server 2022 + +This directory contains the following node definition: + +* `win2022.yaml` - Microsoft Windows Server 2022 node definition + +### Image Availability + +VHD images can be downloaded from microsoft on a trial basis here: https://info.microsoft.com/ww-landing-windows-server-2022.html +Then the VHD image will have to be converted to a .qcow2 format. Linux qumu-img makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html + +For example: + +```sh +qemu-img convert -f vpc -O qcow2 \ + 20348.169.amd64fre.fe_release_svc_refresh.210806-2348_server_serverdatacentereval_en-us.vhd \ + 20348.169.amd64fre.fe_release_svc_refresh.210806-2348_server_serverdatacentereval_en-us.qcow2 +``` + +### Notes + +This node definition uses 16g of RAM and 4vcpu's. Anything less than that and it tends to become buggy. diff --git a/node-definitions/microsoft/Server2022/win2022.yaml b/node-definitions/microsoft/Server2022/win2022.yaml new file mode 100644 index 0000000..5b27cb7 --- /dev/null +++ b/node-definitions/microsoft/Server2022/win2022.yaml @@ -0,0 +1,56 @@ +id: win2022 +general: + description: Windows Server 2022 + nature: server + read_only: false +device: + interfaces: + has_loopback_zero: false + physical: + - eth0 + - eth1 + - eth2 + - eth3 + - eth4 + - eth5 + - eth6 + - eth7 + serial_ports: 1 + default_count: 1 +ui: + visible: true + label_prefix: win2022- + icon: server + label: Windows Server 2022 +sim: + linux_native: + libvirt_domain_driver: kvm + driver: server + disk_driver: sata + ram: 16384 + cpus: 4 + cpu_limit: 100 + nic_driver: e1000 + boot_disk_size: 64 + video: + model: cirrus + memory: 16 +boot: + timeout: 300 +inherited: + image: + ram: true + cpus: true + cpu_limit: true + data_volume: true + boot_disk_size: true + node: + ram: true + cpus: true + cpu_limit: true + data_volume: true + boot_disk_size: true +configuration: + generator: + driver: server +schema_version: 0.0.1 diff --git a/node-definitions/microsoft/Windows 10/Readme.md b/node-definitions/microsoft/Windows10/Readme.md similarity index 86% rename from node-definitions/microsoft/Windows 10/Readme.md rename to node-definitions/microsoft/Windows10/Readme.md index 85dcfa5..a005a25 100644 --- a/node-definitions/microsoft/Windows 10/Readme.md +++ b/node-definitions/microsoft/Windows10/Readme.md @@ -2,12 +2,12 @@ This directory contains the following node definition: -* `Windows 10.yaml` - Microsoft Windows 10 node definition +* `win10.yaml` - Microsoft Windows 10 node definition ### Image Availability VHD images can be downloaded from microsoft on a trial basis here: https://www.microsoft.com/en-us/evalcenter/evaluate-windows-10-enterprise Then the VHD image will have to be converted to a .qcow2 format. Linux qumu-img makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html -### Notes: +### Notes This node definition uses 2 VCPUS and 6 GB RAM. diff --git a/node-definitions/microsoft/Windows 10/Windows 10.yaml b/node-definitions/microsoft/Windows10/win10.yaml similarity index 81% rename from node-definitions/microsoft/Windows 10/Windows 10.yaml rename to node-definitions/microsoft/Windows10/win10.yaml index 392824e..99194c2 100644 --- a/node-definitions/microsoft/Windows 10/Windows 10.yaml +++ b/node-definitions/microsoft/Windows10/win10.yaml @@ -1,24 +1,33 @@ -id: Windows 10 +id: win10 general: nature: server read_only: false - description: Windows 10 Node definition. + description: Windows 10 device: interfaces: has_loopback_zero: false physical: - eth0 - eth1 + - eth2 + - eth3 + - eth4 + - eth5 + - eth6 + - eth7 serial_ports: 1 default_count: 2 ui: visible: true - label_prefix: Windows + label_prefix: win10- icon: host label: Windows 10 description: |- 2 vCPUs 6 GB RAM + Username/Password: + IEUser/Passw0rd! + ##### Note **EXPERIMENTAL** sim: diff --git a/virl-base-images/microsoft/win2019/win2019.yaml b/virl-base-images/microsoft/win2019/win2019.yaml new file mode 100644 index 0000000..889024f --- /dev/null +++ b/virl-base-images/microsoft/win2019/win2019.yaml @@ -0,0 +1,8 @@ +id: win2019 +node_definition_id: win2019 +description: Windows Server 2019 +label: Windows Server 2019 +disk_image: 17763.737.amd64fre.rs5_release_svc_refresh.190906-2324_server_serverdatacentereval_en-us_1.qcow2 +read_only: false +disk_subfolder: win2019 +schema_version: 0.0.1 diff --git a/virl-base-images/microsoft/win2022/win2022.yaml b/virl-base-images/microsoft/win2022/win2022.yaml new file mode 100644 index 0000000..b38c417 --- /dev/null +++ b/virl-base-images/microsoft/win2022/win2022.yaml @@ -0,0 +1,8 @@ +id: win2022 +node_definition_id: win2022 +description: Windows Server 2022 +label: Windows Server 2022 +disk_image: 20348.169.amd64fre.fe_release_svc_refresh.210806-2348_server_serverdatacentereval_en-us.qcow2 +read_only: false +disk_subfolder: win2022 +schema_version: 0.0.1