From 5d2c100e5f701f1eafe18a32f6898bf6c8eb2f62 Mon Sep 17 00:00:00 2001 From: branoTaran Date: Wed, 7 May 2025 17:03:48 +0200 Subject: [PATCH 1/4] SIMPLE-7648: Added configuration to the ISE node definition --- node-definitions/cisco/ise/ise.yaml | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/node-definitions/cisco/ise/ise.yaml b/node-definitions/cisco/ise/ise.yaml index 52e930d..8093017 100644 --- a/node-definitions/cisco/ise/ise.yaml +++ b/node-definitions/cisco/ise/ise.yaml @@ -50,4 +50,51 @@ inherited: configuration: generator: driver: null + provisioning: + files: + - editable: true + name: ise-ztp.conf + content: |- + hostname= + ipv4_addr= + ipv4_mask= + ipv4_default_gw= + # IPv6 is optional + #ipv6_addr= + #ipv6_default_gw= + domain= + primary_nameserver= + # secondary and tertiary are optional + #secondary_nameserver= + #tertiary_nameserver= + primary_ntpserver= + #secondary and tertiary are optional + #secondary_ntpserver= + #tertiary_ntpserver= + #timezone= + #ssh= + username= <--admin is the default for on-prem installations + password= + # Public Key Authentication configuration is optional + #public_key= + # Repository Configuration are optional + #repository_name= + #repository_protocol= + #repository_server_name= + repository_path= + # Patch Information - optional + #patch= + # HotPatches Information - optional + #hotpatches= + # services - optional + #ers= + #openapi= + #pxgrid= + #pxGrid_Cloud= + # Skipping specific checks + #SkipIcmpChecks= + #SkipDnsChecks= + #SkipNtpChecks= + media_type: ext4 + volume_name: ISE-ZTP schema_version: 0.0.1 From 2ff0ed0c4e94b24fb56733a48f3d7f9a60476354 Mon Sep 17 00:00:00 2001 From: Branislav Taran Date: Fri, 23 May 2025 12:54:24 +0200 Subject: [PATCH 2/4] Added Windows 11 node-definition from simple. --- .../microsoft/Windows11/Readme.md | 13 ++++ .../microsoft/Windows11/win11.yaml | 71 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 node-definitions/microsoft/Windows11/Readme.md create mode 100644 node-definitions/microsoft/Windows11/win11.yaml diff --git a/node-definitions/microsoft/Windows11/Readme.md b/node-definitions/microsoft/Windows11/Readme.md new file mode 100644 index 0000000..f9af778 --- /dev/null +++ b/node-definitions/microsoft/Windows11/Readme.md @@ -0,0 +1,13 @@ +# Microsoft Windows 11 + +This directory contains the following node definition: + +* `win11.yaml` - Microsoft Windows 11 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-11-enterprise. Then the VHD image will have to be converted to a .qcow2 format. Linux `qemu-img` makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html + +### Notes + +This node definition uses 2 VCPUS and 6 GB RAM. diff --git a/node-definitions/microsoft/Windows11/win11.yaml b/node-definitions/microsoft/Windows11/win11.yaml new file mode 100644 index 0000000..677e610 --- /dev/null +++ b/node-definitions/microsoft/Windows11/win11.yaml @@ -0,0 +1,71 @@ +id: win11 +general: + nature: server + read_only: false + description: Windows 11 +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: win11- + icon: host + label: Windows 11 + description: |- + 2 vCPUs 6 GB RAM + + Username/Password: + IEUser/Passw0rd! (or whichever is set on installation) + + ##### Note + **EXPERIMENTAL** + + The -waitpkg flag is required for boot with hyperv compatibility, + which speeds up the node; the model setting then required disabling + the other features (hle,rtm,mpx) on the machine used to test this. +sim: + linux_native: + libvirt_domain_driver: kvm + driver: server + disk_driver: sata + ram: 6144 + cpus: 2 + nic_driver: e1000 + video: + model: cirrus + memory: 16 + cpu_limit: 20 + cpu_model: 'Skylake-Server,-waitpkg,-hle,-rtm,-mpx' + machine_type: q35 + enable_tpm: true + efi_boot: true +boot: + timeout: 300 +inherited: + image: + ram: true + cpus: true + data_volume: true + boot_disk_size: true + cpu_limit: true + node: + ram: true + cpus: true + data_volume: true + boot_disk_size: true + cpu_limit: true +configuration: + generator: + driver: server +schema_version: 0.0.1 From a73d8ec7b5b23c85a825bbbf6d7b581b9a821bcb Mon Sep 17 00:00:00 2001 From: Branislav Taran Date: Fri, 23 May 2025 12:59:36 +0200 Subject: [PATCH 3/4] Fixed typo --- node-definitions/microsoft/Windows10/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-definitions/microsoft/Windows10/Readme.md b/node-definitions/microsoft/Windows10/Readme.md index a005a25..681f8a1 100644 --- a/node-definitions/microsoft/Windows10/Readme.md +++ b/node-definitions/microsoft/Windows10/Readme.md @@ -6,7 +6,7 @@ This directory contains the following 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 +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 `qemu-img` makes it easy. Documentation: https://docs.openstack.org/image-guide/convert-images.html ### Notes From 9285a0729883d4232a81b55f0a20a71d9b501c95 Mon Sep 17 00:00:00 2001 From: branoTaran Date: Wed, 4 Jun 2025 16:43:18 +0200 Subject: [PATCH 4/4] Update ise.yaml Updated some of the parameters of the config content; Commented all parameters which are not required to run ISE; For some parameters kept the <...> description but added a sample input to help fill them in; --- node-definitions/cisco/ise/ise.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/node-definitions/cisco/ise/ise.yaml b/node-definitions/cisco/ise/ise.yaml index 8093017..cb36626 100644 --- a/node-definitions/cisco/ise/ise.yaml +++ b/node-definitions/cisco/ise/ise.yaml @@ -32,7 +32,7 @@ sim: memory: 1 efi_boot: false boot: - timeout: 1200 + timeout: 3600 uses_regex: false inherited: image: @@ -55,33 +55,33 @@ configuration: - editable: true name: ise-ztp.conf content: |- - hostname= + hostname=inserthostname-here ipv4_addr= ipv4_mask= ipv4_default_gw= # IPv6 is optional #ipv6_addr= #ipv6_default_gw= - domain= - primary_nameserver= + domain=cisco.com + primary_nameserver= <--example-8.8.8.8 # secondary and tertiary are optional #secondary_nameserver= #tertiary_nameserver= - primary_ntpserver= + primary_ntpserver= <--example-time.google.com #secondary and tertiary are optional #secondary_ntpserver= #tertiary_ntpserver= #timezone= #ssh= - username= <--admin is the default for on-prem installations - password= + username=admin + password=Cisc@123 # Public Key Authentication configuration is optional #public_key= # Repository Configuration are optional #repository_name= #repository_protocol= #repository_server_name= - repository_path= + #repository_path= # Patch Information - optional #patch= # HotPatches Information - optional