Update cloudinit network config

Remove baremetal logic
Rebase to newer ISO;Revert cloudinit config
2022-08-24 15:27:20 +02:00 · 2022-04-25 13:35:30 +02:00 · 2022-04-25 13:21:30 +02:00 · 2022-04-25 09:51:31 +02:00 · 2022-04-25 09:21:05 +02:00 · 2022-04-25 09:15:48 +02:00
81 changed files with 763 additions and 1073 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,54 +1,86 @@
 kind: pipeline
 type: kubernetes
 name: 'Packer Build'
-
-steps:
- name: Windows 10
-  image: bv11-cr01.bessems.eu/library/packer-extended
-  commands:
-  - sed -i -e "s/<<img-productkey>>/$${PRODUCTKEY}/" packer/preseed/Windows10/Autounattend.xml
-  - |
-    sed -i -e "s/<<img-password>>/$${WINRM_PASSWORD}/g" \
-      packer/preseed/Windows10/Autounattend.xml \
-      packer/preseed/Windows10/Sysprep_Unattend.xml
-  - |
-    packer validate \
-      -var-file=packer/variables.vsphere.json \
-      -var vm_name=${DRONE_COMMIT_SHA:0:10}-$DRONE_BUILD_NUMBER \
-      -var vm_guestos=win10 \
-      -var repo_username=$${REPO_USERNAME} \
-      -var repo_password=$${REPO_PASSWORD} \
-      -var vsphere_password=$${VSPHERE_PASSWORD} \
-      -var winrm_password=$${WINRM_PASSWORD} \
-      packer/windows10.json \
-  - |
-    packer build \
-      -on-error=cleanup \
-      -var-file=packer/variables.vsphere.json \
-      -var vm_name=${DRONE_COMMIT_SHA:0:10}-$DRONE_BUILD_NUMBER \
-      -var vm_guestos=win10 \
-      -var repo_username=$${REPO_USERNAME} \
-      -var repo_password=$${REPO_PASSWORD} \
-      -var vsphere_password=$${VSPHERE_PASSWORD} \
-      -var winrm_password=$${WINRM_PASSWORD} \
-      packer/windows10.json \
-  environment:
-    VSPHERE_PASSWORD:
-      from_secret: vsphere_password
-    WINRM_PASSWORD:
-      from_secret: winrm_password
-    REPO_USERNAME:
-      from_secret: repo_username
-    REPO_PASSWORD:
-      from_secret: repo_password
-    PRODUCTKEY:
-      from_secret: prodkey_win10
-    # PACKER_LOG: 1
-  volumes:
-  - name: output
-    path: /output
-
+    
 volumes:
 - name: output
  claim:
    name: flexvolsmb-drone-output
+- name: scratch
+  claim:
+    name: flexvolsmb-drone-scratch
+
+steps:
+- name: Debugging information
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - yamllint --version
+  - packer --version
+  - ansible --version
+  - ovftool --version
+- name: Ubuntu Server 20.04
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: always
+  commands:
+  - |
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
+      packer/preseed/UbuntuServer20.04/user-data
+  - |
+    yamllint -d "{extends: relaxed, rules: {line-length: disable}}" \
+      ansible \
+      packer/preseed/UbuntuServer20.04/user-data \
+      scripts
+  - |
+    packer init -upgrade \
+      ./packer
+  - |
+    packer validate \
+      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -var vm_guestos=ubuntuserver20.04 \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      ./packer
+  - |
+    packer build \
+      -on-error=cleanup -timestamp-ui \
+      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -var vm_guestos=ubuntuserver20.04 \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      ./packer
+  environment:
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+    SSH_PASSWORD:
+      from_secret: ssh_password
+    REPO_USERNAME:
+      from_secret: repo_username
+    REPO_PASSWORD:
+      from_secret: repo_password
+    # PACKER_LOG: 1
+  volumes:
+  - name: output
+    path: /output
+- name: Remove temporary resources
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - |
+    pwsh -file scripts/Remove-Resources.ps1 \
+      -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -VSphereFQDN 'bv11-vc.bessems.lan' \
+      -VSphereUsername 'administrator@vsphere.local' \
+      -VSpherePassword $${VSPHERE_PASSWORD}
+  environment:
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: scratch
+    path: /scratch
+  when:
+    status:
+    - success
+    - failure
--- a/README.md
+++ b/README.md
@ -1,2 +1 @@
-# Packer.Images [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg)](https://ci.spamasaurus.com/djpbessems/Packer.Images)
-
+# Packer.Images [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/Windows10)](https://ci.spamasaurus.com/djpbessems/Packer.Images)
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@ -0,0 +1,3 @@
+[defaults]
+deprecation_warnings = False
+remote_tmp           = /tmp/.ansible-${USER}/tmp
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@ -0,0 +1,7 @@
+---
+- hosts: all
+  gather_facts: false
+  become: true
+  roles:
+    - os
+    - firstboot
--- a/ansible/roles/firstboot/files/ansible_payload/playbook.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/playbook.yml
@ -0,0 +1,10 @@
+---
+- hosts: 127.0.0.1
+  connection: local
+  gather_facts: false
+  # become: true
+  roles:
+    - vapp
+    - network
+    - users
+    - cleanup
--- a/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/main.yml
@ -0,0 +1,20 @@
+- name: Disable crontab job
+  ansible.builtin.cron:
+    name: firstboot
+    state: absent
+- name: Restore extra tty
+  ansible.builtin.lineinfile:
+    path: /etc/systemd/logind.conf
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  loop:
+  - { regexp: '^NAutoVTs=', line: '#NAutoVTs=6'}
+  - { regexp: '^ReserveVT=', line: '#ReserveVT=6'}
+- name: Unmask getty@tty1 service
+  ansible.builtin.systemd:
+    name: getty@tty1
+    enabled: yes
+    masked: no
+- name: Reboot host
+  ansible.builtin.shell:
+    cmd: /usr/sbin/reboot now
--- a/ansible/roles/firstboot/files/ansible_payload/roles/network/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/network/tasks/main.yml
@ -0,0 +1,10 @@
+- name: Set hostname
+  ansible.builtin.hostname:
+    name: "{{ ovfproperties['guestinfo.hostname'] }}"
+- name: Create netplan configuration file
+  ansible.builtin.template:
+    src: netplan.j2
+    dest: /etc/netplan/00-installer-config.yaml
+- name: Apply netplan configuration
+  ansible.builtin.shell:
+    cmd: /usr/sbin/netplan apply
--- a/ansible/roles/firstboot/files/ansible_payload/roles/network/templates/netplan.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/network/templates/netplan.j2
@ -0,0 +1,10 @@
+network:
+  version: 2
+  ethernets:
+    ens192:
+      addresses:
+      - {{ ovfproperties['guestinfo.ipaddress'] }}/{{ ovfproperties['guestinfo.prefixlength'] }}
+      gateway4: {{ ovfproperties['guestinfo.gateway'] }}
+      nameservers:
+        addresses:
+        - {{ ovfproperties['guestinfo.dnsserver'] }}
--- a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
@ -0,0 +1,25 @@
+- name: Set root password
+  ansible.builtin.user:
+    name: root
+    password: "{{ ovfproperties['guestinfo.rootpw'] | password_hash('sha512', 65534 | random(seed=ovfproperties['guestinfo.hostname']) | string) }}"
+    generate_ssh_key: yes
+    ssh_key_bits: 2048
+    ssh_key_file: .ssh/id_rsa
+- name: Save root SSH publickey
+  ansible.builtin.lineinfile:
+    path: /root/.ssh/authorized_keys
+    line: "{{ ovfproperties['guestinfo.rootsshkey'] }}"
+- name: Disable SSH password authentication
+  ansible.builtin.lineinfile:
+    path: /etc/ssh/sshd_config
+    regex: "{{ item.regex }}"
+    line: "{{ item.line }}"
+    state: "{{ item.state }}"
+  loop:
+  - { regex: '^#PasswordAuthentication', line: 'PasswordAuthentication no', state: present}
+  - { regex: '^PasswordAuthentication yes', line: 'PasswordAuthentication yes', state: absent}
+- name: Delete 'ubuntu' user
+  ansible.builtin.user:
+    name: ubuntu
+    state: absent
+    remove: yes
--- a/ansible/roles/firstboot/files/ansible_payload/roles/vapp/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/vapp/tasks/main.yml
@ -0,0 +1,21 @@
+- name: Store current ovfEnvironment
+  ansible.builtin.shell:
+    cmd: /usr/bin/vmtoolsd --cmd "info-get guestinfo.ovfEnv"
+  register: ovfenv
+- name: Parse XML for vApp properties
+  community.general.xml:
+    xmlstring: "{{ ovfenv.stdout }}"
+    namespaces:
+      ns: http://schemas.dmtf.org/ovf/environment/1
+    xpath: /ns:Environment/ns:PropertySection/ns:Property
+    content: attribute
+  register: ovfenv
+- name: Assign vApp properties to dictionary
+  ansible.builtin.set_fact:
+    ovfproperties: >-
+      {{ ovfproperties | default({}) |
+      combine({((item.values() | list)[0].values() | list)[0]:
+      ((item.values() | list)[0].values() | list)[1]})
+      }}
+  loop: "{{ ovfenv.matches }}"
+  no_log: true
--- a/ansible/roles/firstboot/tasks/main.yml
+++ b/ansible/roles/firstboot/tasks/main.yml
@ -0,0 +1,26 @@
+- name: Create destination folder
+  ansible.builtin.file:
+    path: /opt/firstboot
+    state: directory
+- name: Create firstboot script file
+  ansible.builtin.template:
+    src: firstboot.j2
+    dest: /opt/firstboot/firstboot.sh
+    owner: root
+    group: root
+    mode: o+x
+- name: Create @reboot crontab job
+  ansible.builtin.cron:
+    name: firstboot
+    special_time: reboot
+    job: "/opt/firstboot/firstboot.sh"
+- name: Copy payload folder
+  ansible.builtin.copy:
+    src: ansible_payload/
+    dest: /opt/firstboot/ansible/
+    owner: root
+    group: root
+    mode: '0644'
+- name: Install ansible-galaxy collection
+  ansible.builtin.shell:
+    cmd: ansible-galaxy collection install community.general
--- a/ansible/roles/firstboot/templates/firstboot.j2
+++ b/ansible/roles/firstboot/templates/firstboot.j2
@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Apply firstboot configuration w/ ansible
+/usr/local/bin/ansible-playbook /opt/firstboot/ansible/playbook.yml | tee -a /var/log/firstboot.log > /dev/tty1
--- a/ansible/roles/os/tasks/ansible.yml
+++ b/ansible/roles/os/tasks/ansible.yml
@ -0,0 +1,6 @@
+- name: Install ansible (w/ dependencies)
+  ansible.builtin.pip:
+    name: "{{ item }}"
+    executable: pip3
+    state: latest
+  loop: "{{ pip_packages }}"
--- a/ansible/roles/os/tasks/cloud-init.yml
+++ b/ansible/roles/os/tasks/cloud-init.yml
@ -0,0 +1,12 @@
+- name: Delete cloud-init package
+  ansible.builtin.apt:
+    name: cloud-init
+    state: absent
+    purge: yes
+- name: Delete cloud-init files
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - /etc/cloud
+    - /var/lib/cloud
--- a/ansible/roles/os/tasks/logging.yml
+++ b/ansible/roles/os/tasks/logging.yml
@ -0,0 +1,5 @@
+- name: Enable crontab logging
+  ansible.builtin.lineinfile:
+    path: /etc/rsyslog.d/50-default.conf
+    regexp: '^#cron\.\*.*'
+    line: "cron.*\t\t\t\t./var/log/cron.log"
--- a/ansible/roles/os/tasks/main.yml
+++ b/ansible/roles/os/tasks/main.yml
@ -0,0 +1,20 @@
+- name: Disable tty logins
+  import_tasks: tty.yml
+
+- name: Remove snapd
+  import_tasks: snapd.yml
+
+- name: Remove cloud-init
+  import_tasks: cloud-init.yml
+
+- name: Configure default logging
+  import_tasks: logging.yml
+
+- name: Configure services
+  import_tasks: services.yml
+
+- name: Install packages
+  import_tasks: packages.yml
+
+- name: Install ansible
+  import_tasks: ansible.yml
--- a/ansible/roles/os/tasks/packages.yml
+++ b/ansible/roles/os/tasks/packages.yml
@ -0,0 +1,15 @@
+- name: Install additional packages
+  ansible.builtin.apt:
+    name: "{{ item }}"
+    state: latest
+    update_cache: yes
+  loop: "{{ packages }}"
+- name: Upgrade all packages
+  ansible.builtin.apt:
+    name: "*"
+    state: latest
+    update_cache: yes
+- name: Cleanup
+  ansible.builtin.apt:
+    autoremove: yes
+    purge: yes
--- a/ansible/roles/os/tasks/services.yml
+++ b/ansible/roles/os/tasks/services.yml
@ -0,0 +1,5 @@
+- name: Disable & mask networkd-wait-online
+  ansible.builtin.systemd:
+    name: systemd-networkd-wait-online
+    enabled: no
+    masked: yes
--- a/ansible/roles/os/tasks/snapd.yml
+++ b/ansible/roles/os/tasks/snapd.yml
@ -0,0 +1,16 @@
+- name: Delete snapd package
+  ansible.builtin.apt:
+    name: snapd
+    state: absent
+    purge: yes
+- name: Delete leftover files
+  ansible.builtin.file:
+    path: /root/snap
+    state: absent
+- name: Hold snapd package
+  ansible.builtin.dpkg_selections:
+    name: snapd
+    selection: hold
+- name: Reload systemd unit configurations
+  ansible.builtin.systemd:
+    daemon_reload: yes
--- a/ansible/roles/os/tasks/tty.yml
+++ b/ansible/roles/os/tasks/tty.yml
@ -0,0 +1,13 @@
+- name: Disable extra tty
+  ansible.builtin.lineinfile:
+    path: /etc/systemd/logind.conf
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  loop:
+  - { regexp: '^#NAutoVTs=', line: 'NAutoVTs=1'}
+  - { regexp: '^#ReserveVT=', line: 'ReserveVT=11'}
+- name: Mask getty@tty1 service
+  ansible.builtin.systemd:
+    name: getty@tty1
+    enabled: no
+    masked: yes
--- a/ansible/roles/os/vars/main.yml
+++ b/ansible/roles/os/vars/main.yml
@ -0,0 +1,11 @@
+packages:
+  - jq
+  # (python3-*) Dependency for installation of Ansible
+  - python3-pip
+  - python3-setuptools
+  - python3-wheel
+
+pip_packages:
+  - pip
+  - ansible-core
+  - lxml
--- a/inspec/Windows10IoTEnterprise/profile/controls/Win10/Disabled
+++ b/inspec/Windows10IoTEnterprise/profile/controls/Win10/Disabled
@ -1,16 +0,0 @@
-script = <<-EOH
-$nic = get-netadapter
-
-Get-NetAdapterBinding –InterfaceAlias $nic.name –ComponentID ms_tcpip6
-EOH
-
-control "ipv6" do
-    title 'Disabled network protocol IPv6'
-    desc '
-        This test assures that IPv6 is disabled
-    '
-
-    describe powershell(script) do
-        its('stdout') { should match 'False' }
-    end
-end
--- a/inspec/Windows10IoTEnterprise/profile/controls/Win10/Disabled
+++ b/inspec/Windows10IoTEnterprise/profile/controls/Win10/Disabled
@ -1,29 +0,0 @@
-script = <<-EOH
-  # Initialize variable to empty array
-  $NonCompliantServices = @()
-
-  # Specify relevant services
-  $Services = @(
-      "wuauserv",
-      "W3SVC",
-      "XboxGipSvc",
-      "XblGameSave"
-  )
-
-  # Enumerate all services
-  $NonCompliantServices += Get-Service $Services -ErrorAction 'SilentlyContinue' | Where-Object {$_.StartType -ne 'Disabled'}
-
-  # Output; 'True' or list of noncompliant services
-  Write-Output ($True, $NonCompliantServices)[!($NonCompliantServices.Count -eq 0)]
-EOH
-
-control "disabled_services" do
-    title 'Disabled services'
-    desc '
-        This test assures that all unneeded services are set to "disabled".
-    '
-
-    describe powershell(script) do
-        its('stdout') { should match 'True' }
-    end
-end
--- a/inspec/Windows10IoTEnterprise/profile/controls/Win10/Single
+++ b/inspec/Windows10IoTEnterprise/profile/controls/Win10/Single
@ -1,29 +0,0 @@
-script = <<-EOH
-  # Initialize variable to empty array
-  $LogicalDisks = @()
-
-  # Enumerate all logicaldisks
-  # DriveType:
-  #  Unknown (0)
-  #  No Root Directory (1)
-  #  Removable Disk (2)
-  #  Local Disk (3)
-  #  Network Drive (4)
-  #  Compact Disc (5)
-  #  RAM Disk (6)
-  $LogicalDisks += Get-WmiObject -Class 'win32_logicaldisk' -Filter 'DriveType=3'
-
-  # Filter/Quantify
-  ($LogicalDisks.Count -eq 1) -and (($LogicalDisks | Where-Object {$_.DeviceID -ne 'C:'}).Count -eq 0)
-EOH
-
-control "single_disk" do
-    title 'Single Disk'
-    desc '
-        This test assures that only a single disk (C:) is available
-    '
-
-    describe powershell(script) do
-        its('stdout') { should match 'True' }
-    end
-end
--- a/inspec/Windows10IoTEnterprise/profile/controls/Win10/Software
+++ b/inspec/Windows10IoTEnterprise/profile/controls/Win10/Software
@ -1,54 +0,0 @@
-control "software_installed-7zip" do
-    title 'Included Default Applications: 7-Zip'
-    desc '
-        This test assures that the software application "7-Zip" is installed.
-    '
-
-    describe chocolatey_package('7zip.install') do
-        it { should be_installed }
-    end
-end
-
-# control "software_installed-dotnetfx" do
-#     title 'Included Default Applications: .NET'
-#     desc '
-#         This test assures that the software application ".NET" is installed.
-#     '
-
-#     describe chocolatey_package('dotnetfx') do
-#         it { should be_installed }
-#     end
-# end
-
-# control "software_installed-foxitreader" do
-#    title 'Included Default Applications: Foxit Reader'
-#    desc '
-#        This test assures that the software application "Foxit Reader" is installed.
-#    '
-
-#    describe chocolatey_package('foxitreader') do
-#        it { should be_installed }
-#    end
-# end
-
-# control "software_installed-notepadplusplus" do
-#     title 'Included Default Applications: Notepad++'
-#     desc '
-#         This test assures that the software application "Notepad++" is installed.
-#     '
-
-#     describe chocolatey_package('notepadplusplus') do
-#         it { should be_installed }
-#     end
-# end
-
-# control "software_installed-putty" do
-#     title 'Included Default Applications: Putty'
-#     desc '
-#         This test assures that the software application "PuTTy" is installed.
-#     '
-
-#     describe chocolatey_package('putty') do
-#         it { should be_installed }
-#     end
-# end
--- a/inspec/Windows10IoTEnterprise/profile/inspec.yml
+++ b/inspec/Windows10IoTEnterprise/profile/inspec.yml
@ -1,10 +0,0 @@
---
-name: Windows 10 IoT Enterprise
-title: Windows 10 IoT Enterprise InSpec Tests
-summary: Unit test for Windows 10 IoT Enterprise
-version: 1.0.0
-maintainer: https://code.spamasaurus.com/djpbessems
-copyright: https://code.spamasaurus.com/djpbessems
-license: Proprietary
-supports:
-  - platform-family: windows
--- a/packer/iso.auto.pkrvars.hcl
+++ b/packer/iso.auto.pkrvars.hcl
@ -0,0 +1,4 @@
+iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2020.04/ubuntu-20.04.4-live-server-amd64.iso"
+iso_checksum = "sha256:28CCDB56450E643BAD03BB7BCF7507CE3D8D90E8BF09E38F6BD9AC298A98EAAD"
+// iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2020.04/ubuntu-20.04.2-live-server-amd64.iso"
+// iso_checksum = "sha256:D1F2BF834BBE9BB43FAF16F9BE992A6F3935E65BE0EDECE1DEE2AA6EB1767423"
--- a/packer/preseed/UbuntuServer20.04/meta-data
+++ b/packer/preseed/UbuntuServer20.04/meta-data
--- a/packer/preseed/UbuntuServer20.04/user-data
+++ b/packer/preseed/UbuntuServer20.04/user-data
@ -0,0 +1,29 @@
+#cloud-config
+autoinstall:
+  version: 1
+  locale: en_US
+  keyboard:
+    layout: en
+    variant: us
+  network:
+    network:
+      version: 2
+      ethernets:
+        ens192:
+          dhcp4: true
+          dhcp-identifier: mac
+  storage:
+    layout:
+      name: direct
+  identity:
+    hostname: packer-template
+    username: ubuntu
+    # password: $6$ZThRyfmSMh9499ar$KSZus58U/l58Efci0tiJEqDKFCpoy.rv25JjGRv5.iL33AQLTY2aljumkGiDAiX6LsjzVsGTgH85Tx4S.aTfx0
+    password: $6$rounds=4096$ZKfzRoaQOtc$M.fhOsI0gbLnJcCONXz/YkPfSoefP4i2/PQgzi2xHEi2x9CUhush.3VmYKL0XVr5JhoYvnLfFwqwR/1YYEqZy/
+  ssh:
+    install-server: yes
+    allow-pw: true
+  user-data:
+    disable_root: false
+  late-commands:
+    - echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/ubuntu
--- a/packer/preseed/Windows10/Autounattend.xml
+++ b/packer/preseed/Windows10/Autounattend.xml
@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <servicing/>
-    <settings pass="windowsPE">
-        <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <DiskConfiguration>
-                <Disk wcm:action="add">
-                    <CreatePartitions>
-                        <CreatePartition wcm:action="add">
-                            <Order>1</Order>
-                            <Type>Primary</Type>
-                            <Extend>true</Extend>
-                        </CreatePartition>
-                    </CreatePartitions>
-                    <ModifyPartitions>
-                        <ModifyPartition wcm:action="add">
-                            <Extend>false</Extend>
-                            <Format>NTFS</Format>
-                            <Letter>C</Letter>
-                            <Order>1</Order>
-                            <PartitionID>1</PartitionID>
-                            <Label>Windows 10</Label>
-                        </ModifyPartition>
-                    </ModifyPartitions>
-                    <DiskID>0</DiskID>
-                    <WillWipeDisk>true</WillWipeDisk>
-                </Disk>
-                <WillShowUI>OnError</WillShowUI>
-            </DiskConfiguration>
-            <UserData>
-                <AcceptEula>true</AcceptEula>
-                <!-- <FullName>Spamasaurus Rex</FullName>
-                <Organization>Spamasaurus Rex</Organization> -->
-                <ProductKey>
-                    <Key><<img-productkey>></Key>
-                    <WillShowUI>Never</WillShowUI>
-                </ProductKey>
-            </UserData>
-            <ImageInstall>
-                <OSImage>
-                    <InstallTo>
-                        <DiskID>0</DiskID>
-                        <PartitionID>1</PartitionID>
-                    </InstallTo>
-                    <WillShowUI>OnError</WillShowUI>
-                    <InstallToAvailablePartition>false</InstallToAvailablePartition>
-                    <InstallFrom>
-                        <MetaData wcm:action="add">
-                            <Key>/IMAGE/INDEX</Key>
-                            <Value>6</Value>
-                        </MetaData>
-                    </InstallFrom>
-                </OSImage>
-            </ImageInstall>
-        </component>
-        <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <SetupUILanguage>
-                <UILanguage>en-US</UILanguage>
-            </SetupUILanguage>
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UILanguageFallback>en-US</UILanguageFallback>
-            <UserLocale>en-US</UserLocale>
-        </component>
-    </settings>
-    <settings pass="offlineServicing">
-        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <EnableLUA>false</EnableLUA>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <UserAccounts>
-                <AdministratorPassword>
-                    <Value><<img-password>></Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
-            </UserAccounts>
-            <OOBE>
-                <HideEULAPage>true</HideEULAPage>
-                <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
-                <NetworkLocation>Home</NetworkLocation>
-                <ProtectYourPC>1</ProtectYourPC>
-            </OOBE>
-            <AutoLogon>
-                <Password>
-                    <Value><<img-password>></Value>
-                    <PlainText>true</PlainText>
-                </Password>
-                <Username>administrator</Username>
-                <Enabled>true</Enabled>
-            </AutoLogon>
-            <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
-                    <Description>Set execution policy 64bit</Description>
-                    <Order>1</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
-                    <Description>Set execution policy 32bit</Description>
-                    <Order>2</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c reg add "HKLM\System\CurrentControlSet\Control\Network\NewNetworkWindowOff"</CommandLine>
-                    <Description>Disable new network prompt</Description>
-                    <Order>3</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\Set-NetworkProfile.ps1</CommandLine>
-                    <Description>Set network profile to private</Description>
-                    <Order>4</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\Disable-WinRM.ps1</CommandLine>
-                    <Description>Disable WinRM</Description>
-                    <Order>5</Order>
-                    <RequiresUserInput>true</RequiresUserInput>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c a:\Install-VMwareTools.cmd</CommandLine>
-                    <Order>13</Order>
-                    <Description>Install VMware Tools</Description>
-                </SynchronousCommand>
-                <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -File a:\Enable-WinRM.ps1</CommandLine>
-                    <Description>Enable WinRM</Description>
-                    <Order>99</Order>
-                </SynchronousCommand>
-            </FirstLogonCommands>
-            <ShowWindowsLive>false</ShowWindowsLive>
-        </component>
-    </settings>
-    <settings pass="specialize">
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <OEMInformation>
-                <HelpCustomized>false</HelpCustomized>
-            </OEMInformation>
-            <!-- Rename computer here. -->
-            <ComputerName>packer-template</ComputerName>
-            <TimeZone>W. Europe Standard Time</TimeZone>
-            <RegisteredOwner/>
-        </component>
-        <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Security-SPP-UX" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
-            <SkipAutoActivation>true</SkipAutoActivation>
-        </component>
-    </settings>
-</unattend>
--- a/packer/preseed/Windows10/Sysprep_Unattend.xml
+++ b/packer/preseed/Windows10/Sysprep_Unattend.xml
@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<unattend xmlns="urn:schemas-microsoft-com:unattend">
-    <settings pass="generalize">
-        <component name="Microsoft-Windows-Security-SPP" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <SkipRearm>1</SkipRearm>
-        </component>
-        <component name="Microsoft-Windows-PnpSysprep" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <PersistAllDeviceInstalls>true</PersistAllDeviceInstalls>
-            <DoNotCleanUpNonPresentDevices>true</DoNotCleanUpNonPresentDevices>
-        </component>
-    </settings>
-    <settings pass="oobeSystem">
-        <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <InputLocale>en-US</InputLocale>
-            <SystemLocale>en-US</SystemLocale>
-            <UILanguage>en-US</UILanguage>
-            <UserLocale>en-US</UserLocale>
-        </component>
-        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <OOBE>
-                <HideEULAPage>true</HideEULAPage>
-                <HideLocalAccountScreen>true</HideLocalAccountScreen>
-                <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
-                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
-                <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
-                <NetworkLocation>Work</NetworkLocation>
-                <ProtectYourPC>1</ProtectYourPC>
-                <SkipMachineOOBE>true</SkipMachineOOBE>
-                <SkipUserOOBE>true</SkipUserOOBE>
-            </OOBE>
-            <TimeZone>UTC</TimeZone>
-            <UserAccounts>
-                <AdministratorPassword>
-                    <Value>secret</Value>
-                    <PlainText>true</PlainText>
-                </AdministratorPassword>
-            </UserAccounts>
-        </component>
-        <!-- <component name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <RunSynchronous>
-                <RunSynchronousCommand wcm:action="add">
-                    <Order>1</Order>
-                    <Path>c:\windows\system32\net.exe user administrator /active:yes</Path>
-                    <Description>Enable Built-in Administrator</Description>
-                    <CommandLine></CommandLine>
-                </RunSynchronousCommand>
-            </RunSynchronous>
-        </component> -->
-    </settings>
-    <settings pass="specialize">
-    </settings>
-</unattend>
--- a/packer/ubuntuserver20.04.pkr.hcl
+++ b/packer/ubuntuserver20.04.pkr.hcl
@ -0,0 +1,100 @@
+packer {
+  required_plugins {
+  }
+}
+
+source "vsphere-iso" "ubuntuserver" {
+  vcenter_server          = var.vcenter_server
+  username                = var.vsphere_username
+  password                = var.vsphere_password
+  insecure_connection     = "true"
+
+  vm_name                 = "${var.vm_guestos}-${var.vm_name}"
+  datacenter              = var.vsphere_datacenter
+  cluster                 = var.vsphere_cluster
+  host                    = var.vsphere_host
+  folder                  = var.vsphere_folder
+  datastore               = var.vsphere_datastore
+
+  guest_os_type           = "ubuntu64Guest"
+
+  boot_order              = "disk,cdrom"
+  boot_command            = [
+    "<enter><wait2><enter><wait><f6><esc><wait>",
+    " autoinstall<wait2> ds=nocloud;",
+    "<wait><enter>"
+  ]
+  boot_wait               = "2s"
+
+  communicator            = "ssh"
+  ssh_username            = "ubuntu"
+  ssh_password            = var.ssh_password
+  ssh_timeout             = "20m"
+  ssh_handshake_attempts  = "100"
+  ssh_pty                 = true
+
+  CPUs                    = 2
+  RAM                     = 4096
+
+  network_adapters {
+    network               = var.vsphere_network
+    network_card          = "vmxnet3"
+  }
+  storage {
+    disk_size             = 20480
+    disk_thin_provisioned = true
+  }
+  disk_controller_type    = ["pvscsi"]
+  usb_controller          = ["xhci"]
+
+  cd_files                = [
+    "packer/preseed/UbuntuServer20.04/user-data",
+    "packer/preseed/UbuntuServer20.04/meta-data"
+  ]
+  cd_label                = "cidata"
+  iso_url                 = local.iso_authenticatedurl
+  iso_checksum            = var.iso_checksum
+
+  shutdown_command        = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
+  shutdown_timeout        = "5m"
+
+  export {
+    images                = false
+    output_directory      = "/scratch/ubuntuserver"
+  }
+  remove_cdrom            = true
+}
+
+build {
+  sources = [
+    "source.vsphere-iso.ubuntuserver"
+  ]
+
+  provisioner "ansible" {
+    only             = ["vsphere-iso.ubuntuserver"]
+
+    playbook_file    = "ansible/playbook.yml"
+    user             = "ubuntu"
+    ansible_env_vars = [
+      "ANSIBLE_CONFIG=ansible/ansible.cfg"
+    ]
+    use_proxy        = "false"
+    extra_arguments  = [
+      "--extra-vars", "ansible_ssh_pass=${var.ssh_password}"
+    ]
+  }
+
+  post-processor "shell-local" {
+    only   = ["vsphere-iso.ubuntuserver"]
+    inline = [
+      "pwsh -command \"& scripts/Update-OvfConfiguration.ps1 \\",
+      " -OVFFile '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " -Parameter @{'appliance.name'='${var.vm_guestos}';'appliance.version'='${var.vm_name}'}\"",
+      "pwsh -file scripts/Update-Manifest.ps1 \\",
+      " -ManifestFileName '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.mf'",
+      "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
+      " '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " /output/Ubuntu-Server-20.04.ova"
+    ]
+  }
+}
--- a/packer/variables.pkr.hcl
+++ b/packer/variables.pkr.hcl
@ -0,0 +1,31 @@
+variable "vcenter_server" {}
+variable "vsphere_username" {}
+variable "vsphere_password" {
+    sensitive = true
+}
+
+variable "vsphere_host" {}
+variable "vsphere_datacenter" {}
+variable "vsphere_cluster" {}
+
+variable "vsphere_templatefolder" {}
+variable "vsphere_folder" {}
+variable "vsphere_datastore" {}
+variable "vsphere_network" {}
+
+variable "vm_name" {}
+variable "vm_guestos" {}
+variable "ssh_password" {
+    sensitive = true
+}
+
+variable "iso_url" {}
+variable "iso_checksum" {}
+variable "repo_username" {}
+variable "repo_password" {
+    sensitive = true
+}
+local "iso_authenticatedurl" {
+    expression = "https://${var.repo_username}:${var.repo_password}@${var.iso_url}"
+    sensitive  = true
+}
--- a/packer/variables.vsphere.json
+++ b/packer/variables.vsphere.json
@ -1,11 +0,0 @@
-{
-    "vcenter_server":           "bv11-vc01.bessems.lan",
-    "vsphere_username":         "administrator@vsphere.local",
-    "vsphere_datacenter":       "DeSchakel",
-    "vsphere_host":             "bv11-esx.bessems.eu",
-    "vsphere_hostip":           "192.168.11.200",
-    "vsphere_datastore":        "Datastore02.SSD",
-    "vsphere_folder":           "/Packer",
-    "vsphere_templatefolder":   "/Templates",
-    "vsphere_network":          "LAN"
-}
--- a/packer/vsphere.auto.pkrvars.hcl
+++ b/packer/vsphere.auto.pkrvars.hcl
@ -0,0 +1,9 @@
+vcenter_server         = "bv11-vc.bessems.lan"
+vsphere_username       = "administrator@vsphere.local"
+vsphere_datacenter     = "DeSchakel"
+vsphere_cluster        = "Cluster.Legacy"
+vsphere_host           = "bv11-esx.bessems.lan"
+vsphere_datastore      = "ESX00.SSD01"
+vsphere_folder         = "/Packer"
+vsphere_templatefolder = "/Templates"
+vsphere_network        = "LAN"
--- a/packer/windows10.json
+++ b/packer/windows10.json
@ -1,131 +0,0 @@
-{
-    "builders": [
-      {
-        "type":                 "vsphere-iso",
-        "name":                 "win10",
-
-        "vcenter_server":       "{{user `vcenter_server`}}",
-        "username":             "{{user `vsphere_username`}}",
-        "password":             "{{user `vsphere_password`}}",
-        "insecure_connection":  "true",
-
-        "vm_name":              "{{user `vm_guestos`}}-{{user `vm_name`}}",
-        "datastore":            "{{user `vsphere_datastore`}}",
-        "folder":               "{{user `vsphere_folder`}}",
-        "datacenter":           "{{user `vsphere_datacenter`}}",
-        "host":                 "{{user `vsphere_host`}}",
-        "boot_order":           "disk,cdrom",
-
-        "guest_os_type":        "windows9_64Guest",
-
-        "communicator":         "winrm",
-        "winrm_username":       "administrator",
-        "winrm_password":       "{{user `winrm_password`}}",
-        "winrm_timeout":        "10m",
-
-        "cpus":                 2,
-        "RAM":                  8192,
-
-        "network_adapters": [
-          {
-            "network":          "{{user `vsphere_network`}}",
-            "network_card":     "vmxnet3"
-          }
-        ],
-        "storage": [
-          {
-            "disk_size":        20480,
-            "disk_thin_provisioned": true
-          }
-        ],
-        "disk_controller_type": "lsilogic-sas",
-        "usb_controller":       "xhci",
-
-        "iso_url":              "https://{{user `repo_username`}}:{{user `repo_password`}}@sn.itch.fyi/Repository/iso/Microsoft/Windows%2010/20H2/Win10_20H2_v2_English_x64.iso",
-        "iso_checksum":         "sha256:6C6856405DBC7674EDA21BC5F7094F5A18AF5C9BACC67ED111E8F53F02E7D13D",
-        "iso_paths": [
-            "ISO-files/VMware-tools-windows-11.2.1-17243207/VMware-tools-windows-11.2.1-17243207.iso"
-        ],
-
-        "floppy_files": [
-            "packer/preseed/Windows10/Autounattend.xml",
-            "packer/preseed/Windows10/Sysprep_Unattend.xml",
-            "scripts/Set-NetworkProfile.ps1",
-            "scripts/Disable-WinRM.ps1",
-            "scripts/Enable-WinRM.ps1",
-            "scripts/Install-VMwareTools.cmd"
-        ],
-
-        "boot_command":         "",
-        "boot_wait":            "5m",
-
-        "shutdown_command":     "C:\\Windows\\System32\\Sysprep\\sysprep.exe /generalize /oobe /unattend:A:\\Sysprep_Unattend.xml",
-        "shutdown_timeout":     "1h",
-
-        "export": {
-          "images":             false
-        }
-      }     
-    ],
-    "provisioners": [
-      {
-        "type":                 "windows-update"
-      },
-      {
-        "type":                 "powershell",
-        "inline": [
-          "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
-          "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
-        ]
-      },
-      {
-        "type":                 "powershell",
-        "inline": [
-          "choco config set --name=limit-output --value=LimitOutput",
-          "choco install -y 7zip.install",
-          "choco install -y putty"
-        ]
-      },
-      {
-        "type":                 "powershell",
-        "scripts": [
-          "scripts/Windows10/01.Disabled services.ps1",
-          "scripts/Windows10/02.Disable IPv6.ps1",
-          "scripts/Windows10/03.Power settings timeout.ps1"
-        ]
-      },
-      {
-        "type":                 "windows-update"
-      },
-      {
-        "type":                 "windows-restart",
-        "restart_check_command":"powershell -command \"& {Write-Output 'Probing restart status'}\""
-      }
-    ],
-    "post-processors": [[
-      {
-        "type":                 "shell-local",
-        "inline": [
-          "pwsh -file scripts/Update-OvfConfiguration.ps1 \\",
-          " -OVFFile './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf'",
-          "pwsh -file scripts/Update-Manifest.ps1 \\",
-          " -ManifestFileName './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.mf'",
-          "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
-          " './output-win10/{{user `vm_guestos`}}-{{user `vm_name`}}.ovf' \\",
-          " /output/Windows10.ova"
-        ]
-      }
-    ],
-    [
-      {
-        "type":                 "shell-local",
-        "inline": [
-          "pwsh -file scripts/Remove-Resources.ps1 \\",
-          " -VMName '{{user `vm_guestos`}}-{{user `vm_name`}}' \\",
-          " -VSphereFQDN '{{user `vcenter_server`}}' \\",
-          " -VSphereUsername '{{user `vsphere_username`}}' \\",
-          " -VSpherePassword '{{user `vsphere_password`}}'"
-        ]
-      }
-    ]]    
-  }
--- a/packer/windows10.virt+phys.json
+++ b/packer/windows10.virt+phys.json
@ -1,156 +0,0 @@
-{
-    "builders": [
-      {
-        "type":                 "vsphere-iso",
-        "name":                 "win10-virtual",
-
-        "vcenter_server":       "{{user `vcenter_server`}}",
-        "username":             "{{user `vsphere_username`}}",
-        "password":             "{{user `vsphere_password`}}",
-        "insecure_connection":  "true",
-
-        "vm_name":              "{{user `vm_guestos`}}-{{user `vm_name`}}-virtual",
-        "datastore":            "{{user `vsphere_datastore`}}",
-        "folder":               "{{user `vsphere_folder`}}",
-        "datacenter":           "{{user `vsphere_datacenter`}}",
-        "host":                 "{{user `vsphere_host`}}",
-        "boot_order":           "disk,cdrom",
-
-        "guest_os_type":        "windows9_64Guest",
-
-        "communicator":         "winrm",
-        "winrm_username":       "administrator",
-        "winrm_password":       "{{user `winrm_password`}}",
-        "winrm_timeout":        "10m",
-
-        "cpus":                 2,
-        "RAM":                  8192,
-
-        "network_adapters": [
-          {
-            "network":          "{{user `vsphere_network`}}",
-            "network_card":     "vmxnet3"
-          }
-        ],
-        "storage": [
-          {
-            "disk_size":        20480,
-            "disk_thin_provisioned": true
-          }
-        ],
-        "disk_controller_type": "lsilogic-sas",
-        "usb_controller":       "xhci",
-
-        "iso_url":              "https://sn.itch.fyi/Repository/iso/Microsoft/Windows%2010/20H2/Win10_20H2_v2_English_x64.iso",
-        "iso_checksum":         "sha256:6C6856405DBC7674EDA21BC5F7094F5A18AF5C9BACC67ED111E8F53F02E7D13D",
-        "iso_paths": [
-            "[Datastore01.NAS] contentlib-5c2187fa-55c5-4285-b06b-3f5f1ff9428d/e9342f62-6132-4044-bd42-48cab8c77034/VMware-tools-windows-11.2.1-17243207_4f88be10-b163-446b-ad7d-992e63b0e3ac.iso"
-        ],
-
-        "floppy_files": [
-            "packer/preseed/Windows10/Autounattend.xml",
-            "packer/preseed/Windows10/Sysprep_Unattend.xml",
-            "scripts/Set-NetworkProfile.ps1",
-            "scripts/Disable-WinRM.ps1",
-            "scripts/Enable-WinRM.ps1",
-            "scripts/Install-VMwareTools.cmd"
-        ],
-
-        "boot_command":         "",
-        "boot_wait":            "5m",
-
-        "shutdown_command":     "C:\\Windows\\System32\\Sysprep\\sysprep.exe /generalize /oobe /unattend:A:\\Sysprep_Unattend.xml",
-        "shutdown_timeout":     "1h"
-      },
-      {
-        "type":                 "vsphere-iso",
-        "name":                 "win10-physical",
-
-        "vcenter_server":       "{{user `vcenter_server`}}",
-        "username":             "{{user `vsphere_username`}}",
-        "password":             "{{user `vsphere_password`}}",
-        "insecure_connection":  "true",
-
-        "vm_name":              "{{user `vm_guestos`}}-{{user `vm_name`}}-physical",
-        "datastore":            "{{user `vsphere_datastore`}}",
-        "folder":               "{{user `vsphere_folder`}}",
-        "datacenter":           "{{user `vsphere_datacenter`}}",
-        "host":                 "{{user `vsphere_host`}}",
-        "boot_order":           "disk,cdrom",
-
-        "guest_os_type":        "windows9_64Guest",
-
-        "communicator":         "winrm",
-        "winrm_username":       "administrator",
-        "winrm_password":       "{{user `winrm_password`}}",
-        "winrm_timeout":        "10m",
-
-        "cpus":                 2,
-        "RAM":                  8192,
-
-        "network_adapters": [
-          {
-            "network":          "{{user `vsphere_network`}}",
-            "network_card":     "vmxnet3"
-          }
-        ],
-        "storage": [
-          {
-            "disk_size":        20480,
-            "disk_thin_provisioned": true
-          }
-        ],
-        "disk_controller_type": "lsilogic-sas",
-        "usb_controller":       "xhci",
-
-        "iso_url":              "https://sn.itch.fyi/Repository/iso/Microsoft/Windows%2010/20H2/Win10_20H2_v2_English_x64.iso",
-        "iso_checksum":         "sha256:6C6856405DBC7674EDA21BC5F7094F5A18AF5C9BACC67ED111E8F53F02E7D13D",
-        "iso_paths": [
-            "[Datastore01.NAS] contentlib-5c2187fa-55c5-4285-b06b-3f5f1ff9428d/e9342f62-6132-4044-bd42-48cab8c77034/VMware-tools-windows-11.2.1-17243207_4f88be10-b163-446b-ad7d-992e63b0e3ac.iso"
-        ],
-
-        "floppy_files": [
-            "packer/preseed/Windows10/Autounattend.xml",
-            "packer/preseed/Windows10/Sysprep_Unattend.xml",
-            "scripts/Set-NetworkProfile.ps1",
-            "scripts/Disable-WinRM.ps1",
-            "scripts/Enable-WinRM.ps1",
-            "scripts/Install-VMwareTools.cmd",
-            "scripts/Uninstall-VMwareTools.Sysprep.cmd"
-        ],
-
-        "boot_command":         "",
-        "boot_wait":            "5m",
-
-        "shutdown_command":     "A:\\Uninstall-VMwareTools.Sysprep.cmd",
-        "shutdown_timeout":     "1h"
-      }      
-    ],
-    "provisioners": [
-      {
-        "type":                 "windows-update"
-      },
-      {
-        "type":                 "powershell",
-        "inline": [
-          "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
-          "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
-        ]
-      },
-      {
-        "type":                 "powershell",
-        "inline": [
-          "choco config set --name=limit-output --value=LimitOutput",
-          "choco install -y 7zip.install",
-          "choco install -y putty"
-        ]
-      },
-      {
-        "type":                 "windows-update"
-      },
-      {
-        "type":                 "windows-restart",
-        "restart_check_command":"powershell -command \"& {Write-Output 'Probing restart status'}\""
-      }
-    ]
-  }
--- a/scripts/Copy-DatastoreItem.ps1
+++ b/scripts/Copy-DatastoreItem.ps1
@ -1,52 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory)]
-    [string]$VMName,
-    [Parameter(Mandatory)]
-    [string]$VSphereFQDN,
-    [Parameter(Mandatory)]
-    [string]$VSphereUsername,
-    [Parameter(Mandatory)]
-    [string]$VSpherePassword
-)
-
-$PowerCliConfigurationSplat = @{
-    Scope                    = 'User'
-    ParticipateInCEIP        = $False
-    Confirm                  = $False
-    InvalidCertificateAction = 'Ignore'
-}
-Set-PowerCLIConfiguration @PowerCliConfigurationSplat | Out-Null
-
-$ConnectVIServerSplat = @{
-    Server        = $VSphereFQDN
-    User          = "$VSphereUsername"
-    Password      = "$VSpherePassword"
-    WarningAction = 'SilentlyContinue'
-}
-Connect-VIServer @ConnectVIServerSplat | Out-Null
-
-$GetVMSplat = @{
-    Name = $VMName
-}
-$VM = Get-VM @GetVMSplat
-
-$GetHarddiskSplat = @{
-    VM = $VM
-}
-$Harddisk = Get-Harddisk @GetHarddiskSplat
-$VMFolder = ($Harddisk.Filename.Substring(0, $Harddisk.Filename.LastIndexOf('/')) -split ' ')[1]
-
-$NewDatastoreDriveSplat = @{
-    Name      = 'ds'
-    Datastore = ($VM | Get-Datastore)
-}
-New-DatastoreDrive @NewDatastoreDriveSplat
-
-$CopyDatastoreItemSplat = @{
-    Item        = "ds:\$($VMFolder)\*.vmdk"
-    Destination = (Get-Item $PWD)
-}
-Copy-DatastoreItem @CopyDatastoreItemSplat
-
-Disconnect-VIServer * -Confirm:$False
--- a/scripts/Disable-WinRM.ps1
+++ b/scripts/Disable-WinRM.ps1
@ -1,8 +0,0 @@
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=block
-netsh advfirewall firewall set rule group="Windows Remote Management" new enable=yes
-$winrmService = Get-Service -Name WinRM
-if ($winrmService.Status -eq "Running"){
-    Disable-PSRemoting -Force
-}
-Stop-Service winrm
-Set-Service -Name winrm -StartupType Disabled
--- a/scripts/Enable-WinRM.ps1
+++ b/scripts/Enable-WinRM.ps1
@ -1,18 +0,0 @@
-$NetworkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"))
-$Connections = $NetworkListManager.GetNetworkConnections()
-$Connections | ForEach-Object { $_.GetNetwork().SetCategory(1) }
-
-Enable-PSRemoting -Force
-winrm quickconfig -q
-winrm quickconfig -transport:http
-winrm set winrm/config '@{MaxTimeoutms="1800000"}'
-winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="800"}'
-winrm set winrm/config/service '@{AllowUnencrypted="true"}'
-winrm set winrm/config/service/auth '@{Basic="true"}'
-winrm set winrm/config/client/auth '@{Basic="true"}'
-winrm set winrm/config/listener?Address=*+Transport=HTTP '@{Port="5985"}'
-netsh advfirewall firewall set rule group="Windows Remote Administration" new enable=yes
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" new enable=yes action=allow
-netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public new remoteip=any
-Set-Service winrm -startuptype "auto"
-Restart-Service winrm
--- a/scripts/Install-VMwareTools.cmd
+++ b/scripts/Install-VMwareTools.cmd
@ -1,2 +0,0 @@
-@rem Silent mode, basic UI, no reboot
-e:\setup64 /s /v "/qb REBOOT=R"
--- a/scripts/MVMC/BlockList.xml
+++ b/scripts/MVMC/BlockList.xml
@ -1,73 +0,0 @@
-<?xml version="1.0"  encoding="utf-8" ?>
-<BlockList>
-    <!-- services to disable -->
-    <Services>
-		<Name>MVMCP2VAgent</Name>
-		<Name>VMTools</Name>
-		<Name> VMUpgradeHelper </Name>
-		<Name> vmvss </Name>
-        <Name>vmdesched</Name>
-        <Name>Virtual Server</Name>
-        <!-- Virtual Machine Helper -->
-        <Name>vmh</Name>
-        <!-- Xen-specific service -->
-        <Name>xensvc</Name>
-    </Services>
-    <!-- drivers to disable -->
-    <Drivers>
-        <Name>vmx_svga</Name>
-        <Name>vmmouse</Name>
-        <Name>vmscsi</Name>
-        <Name>amdpcn</Name>
-        <Name>PCnet</Name>
-        <Name>VMMEMCTL</Name>
-
-        <Name> pvscsi </Name>
-        <Name> vmci </Name>
-        <Name> vmmouse </Name>
-        <Name> vmaudio </Name>
-        <Name> vmrawdsk </Name>
-        <Name> vmxnet </Name>
-        <Name> vmxnet3ndis6 </Name>
-        <Name> vm3dmp </Name>
-        <Name> vmdebug </Name>
-        <Name> vmxnet3ndis5 </Name>
-
-        
-        <Name>cirrus</Name>
-        <!-- storage drivers -->
-        <Name>buslogic</Name>
-        <Name>symc810</Name>
-        <Name>cpqarray</Name>
-        <Name>pcntn4m</Name>
-        <Name>cpqnf3</Name>
-        <Name>MRaidNT</Name>
-        <Name>Symc8XX</Name>
-        <!-- VIA chipset drivers -->
-        <Name>viaide</Name>
-        <Name>VIAudio</Name>
-        <Name>VIAPFD</Name>
-        <Name>viafilter</Name>
-        <Name>viaagp</Name>
-        <Name>viaagp1</Name>
-        <!-- network drivers: Intel(R) PRO/100 -->
-        <Name>E100B</Name>
-        <!-- tape drivers -->
-        <Name>4mmdat</Name>
-        <Name>4mmdat-SeSFT</Name>
-        <Name>SCSIChanger</Name>
-
-        <!-- Virtual Machine Monitor -->
-        <Name>vmm</Name>
-        <!-- Xen-specific drivers -->
-        <Name>xenevtchn</Name>
-        <Name>xenvbd</Name>
-        <Name>xennet</Name>
-    </Drivers>
-    <Programs>
-        <Name>ProMON</Name>
-        <Name>s3tray2</Name>
-        <Name>VMwareTray</Name>
-        <Name>VMwareUser</Name>
-    </Programs>
-</BlockList>
--- a/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Framework.Core.dll
--- a/scripts/MVMC/Microsoft.Accelerators.Framework.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Framework.dll
--- a/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Mvmc.Engine.dll
--- a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshCommon.dll
--- a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x64.dll
--- a/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll
+++ b/scripts/MVMC/Microsoft.Accelerators.Mvmc.ScxSshWrapper_x86.dll
--- a/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll
+++ b/scripts/MVMC/Microsoft.Practices.ServiceLocation.dll
--- a/scripts/MVMC/Microsoft.Practices.Unity.dll
+++ b/scripts/MVMC/Microsoft.Practices.Unity.dll
--- a/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll
+++ b/scripts/MVMC/Microsoft.Samples.WindowsAzure.ServiceManagement.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.CloudService.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.ConsoleAppUtils.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.Service.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceBus.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.ServiceManagement.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.SqlDatabase.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.Sync.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.Tools.Vhd.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.Websites.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Management.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Management.dll
--- a/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll
+++ b/scripts/MVMC/Microsoft.WindowsAzure.Storage.dll
--- a/scripts/MVMC/MvmcCmdlet.dll
+++ b/scripts/MVMC/MvmcCmdlet.dll
--- a/scripts/MVMC/MvmcCmdlet.psd1
+++ b/scripts/MVMC/MvmcCmdlet.psd1
--- a/scripts/MVMC/Sshlib_x64.dll
+++ b/scripts/MVMC/Sshlib_x64.dll
--- a/scripts/MVMC/Sshlib_x86.dll
+++ b/scripts/MVMC/Sshlib_x86.dll
--- a/scripts/MVMC/System.Reactive.Core.dll
+++ b/scripts/MVMC/System.Reactive.Core.dll
--- a/scripts/MVMC/System.Reactive.Interfaces.dll
+++ b/scripts/MVMC/System.Reactive.Interfaces.dll
--- a/scripts/MVMC/System.Reactive.Linq.dll
+++ b/scripts/MVMC/System.Reactive.Linq.dll
--- a/scripts/MVMC/System.Reactive.PlatformServices.dll
+++ b/scripts/MVMC/System.Reactive.PlatformServices.dll
--- a/scripts/MVMC/System.Reactive.Providers.dll
+++ b/scripts/MVMC/System.Reactive.Providers.dll
--- a/scripts/MVMC/System.Reactive.Windows.Threading.dll
+++ b/scripts/MVMC/System.Reactive.Windows.Threading.dll
--- a/scripts/New-WindowsImageJob.ps1
+++ b/scripts/New-WindowsImageJob.ps1
@ -1,51 +0,0 @@
-#Requires -Modules 'dism'
-Param(
-    [Parameter(Mandatory)]
-    [string]$ImageName,
-    [Parameter(Mandatory)]
-    [string]$SourceFolder,
-    [Parameter(Mandatory)]
-    [string]$DestinationFile
-)
-
-$StartJobSplat = @{
-    ArgumentList = $ImageName, $SourceFolder, $DestinationFile
-    ScriptBlock  = {
-        Param(
-            $ImageName,
-            $SourceFolder,
-            $DestinationFile
-        )
-
-        $NewWindowsImageSplat = @{
-            Name        = $ImageName
-            CapturePath = $SourceFolder
-            ImagePath   = $DestinationFile
-            Verify      = $True
-        }
-        New-WindowsImage @NewWindowsImageSplat
-        }
-}
-$Job = Start-Job @StartJobSplat
-
-While ($Job.State -eq 'Running') {
-    $GetItemSplat = @{
-        Path        = $DestinationFile
-        ErrorAction = 'SilentlyContinue'
-    }
-    $OutputFile = Get-Item @GetItemSplat
-    If ($OutputFile) {
-        Write-Host "Export in progress ... $($OutputFile.FullName); Size: $('{0:n2}' -f ($OutputFile.Length / 1MB))MB"
-    }
-    Else {
-        Write-Host "Export initiating ... "
-    }
-
-    $StartSleepSplat = @{
-        Seconds = 30
-    }
-    Start-Sleep @StartSleepSplat
-}
-
-Receive-Job $Job
-Remove-Job $Job
--- a/scripts/Remove-Resources.ps1
+++ b/scripts/Remove-Resources.ps1
@ -26,14 +26,26 @@ $ConnectVIServerSplat = @{
 }
 Connect-VIServer @ConnectVIServerSplat | Out-Null

-$RemoveVMSplat = @{
-    VM                       = "$($VMName)*"
-    DeletePermanently        = $True
-    Confirm                  = $False
-    ErrorAction              = 'SilentlyContinue'
+$GetVMSplat = @{
+    Name        = "*$($VMName)*"
+    ErrorAction = 'SilentlyContinue'
+}
+If ([boolean](Get-VM @GetVMSplat)) {
+    $RemoveVMSplat = @{
+        VM                       = Get-VM @GetVMSplat
+        DeletePermanently        = $True
+        Confirm                  = $False
+        ErrorAction              = 'SilentlyContinue'
+    }
+    Remove-VM @RemoveVMSplat
 }
-Remove-VM @RemoveVMSplat

-# Also delete ISO/floppy?
+Disconnect-VIServer * -Confirm:$False

-Disconnect-VIServer * -Confirm:$False
+$RemoveItemSplat = @{
+    Path    = "/scratch/*"
+    Recurse = $True
+    Force   = $True
+    Confirm = $False
+}
+Remove-Item @RemoveItemSplat
--- a/scripts/Set-NetworkProfile.ps1
+++ b/scripts/Set-NetworkProfile.ps1
@ -1,23 +0,0 @@
-# You cannot enable Windows PowerShell Remoting on network connections that are set to Public
-# Spin through all the network locations and if they are set to Public, set them to Private
-# using the INetwork interface:
-# http://msdn.microsoft.com/en-us/library/windows/desktop/aa370750(v=vs.85).aspx
-# For more info, see:
-# http://blogs.msdn.com/b/powershell/archive/2009/04/03/setting-network-location-to-private.aspx
-
-# Network location feature was only introduced in Windows Vista - no need to bother with this
-# if the operating system is older than Vista
-if([environment]::OSVersion.version.Major -lt 6) { return }
-
-# You cannot change the network location if you are joined to a domain, so abort
-if(1,3,4,5 -contains (Get-WmiObject win32_computersystem).DomainRole) { return }
-
-# Get network connections
-$networkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"))
-$connections = $networkListManager.GetNetworkConnections()
-
-$connections |foreach {
-	Write-Host $_.GetNetwork().GetName()"category was previously set to"$_.GetNetwork().GetCategory()
-	$_.GetNetwork().SetCategory(1)
-	Write-Host $_.GetNetwork().GetName()"changed to category"$_.GetNetwork().GetCategory()
-}
--- a/scripts/Uninstall-VMwareTools.Sysprep.cmd
+++ b/scripts/Uninstall-VMwareTools.Sysprep.cmd
@ -1,7 +0,0 @@
-@rem Uninstall VMware Tools
-@rem (wait for orphaned child process to finish)
-@rem Silent mode, basic UI, no reboot
-start "Uninstall VMware Tools" /b /w e:\setup64 /s /v "/qb REBOOT=R REMOVE=ALL"
-
-@rem Initiate Sysprep
-C:\Windows\System32\Sysprep\sysprep.exe /generalize /oobe /unattend:A:\Sysprep_Unattend.xml /quiet /shutdown
--- a/scripts/Update-OvfConfiguration.ps1
+++ b/scripts/Update-OvfConfiguration.ps1
@ -9,7 +9,8 @@ Param(
                Throw "'$_' is not a valid filename (within working directory '$PWD'), or access denied; aborting."
            }
        })]
-    [string]$OVFFile
+    [string]$OVFFile,
+    [hashtable]$Parameter
 )

 $GetContentSplat = @{
@ -21,7 +22,24 @@ $ConvertFromYamlSplat = @{
    Yaml         = $RawContent
    AllDocuments = $True
 }
-$OVFConfig = ConvertFrom-Yaml @ConvertFromYamlSplat
+$YamlDocuments = ConvertFrom-Yaml @ConvertFromYamlSplat
+
+# Check if the respective .yml file declared substitutions which need to be parsed
+If (($YamlDocuments.Count -gt 1) -and $YamlDocuments[-1].Variables) {
+    ForEach ($Pattern in $YamlDocuments[-1].Variables) {
+        $RawContent = $RawContent -replace "\{\{ ($($Pattern.Name)) \}\}", [string](Invoke-Expression -Command $Pattern.Expression)
+    }
+    # Perform conversion to Yaml again, now with parsed file contents
+    $ConvertFromYamlSplat = @{
+        Yaml         = $RawContent
+        AllDocuments = $True
+    }
+    $YamlDocuments = ConvertFrom-Yaml @ConvertFromYamlSplat
+    $OVFConfig = $YamlDocuments[0..($YamlDocuments.Count - 2)]
+}
+Else {
+    $OVFConfig = $YamlDocuments
+}

 $SourceFile = Get-Item -Path $OVFFile
 $GetContentSplat = @{
@ -29,7 +47,77 @@ $GetContentSplat = @{
 }
 $XML = [xml](Get-Content @GetContentSplat)
 $NS = [System.Xml.XmlNamespaceManager]$XML.NameTable
-[void]$NS.AddNamespace('Any', $XML.DocumentElement.xmlns)
+[void]$NS.AddNamespace('ns', $XML.DocumentElement.xmlns)
+[void]$NS.AddNamespace('ovf', $XML.DocumentElement.ovf)
+[void]$NS.AddNamespace('rasd', $XML.DocumentElement.rasd)
+[void]$NS.AddNamespace('vmw', $XML.DocumentElement.vmw)
+
+# Create copy of existing 'Item/ResourceType'=17 (=Hard disk) node
+$XMLDiskTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='17']", $NS).ParentNode.CloneNode($True)
+
+ForEach ($Disk in $OVFConfig.DynamicDisks) {
+    # Determine next free available 'diskId'
+    $XMLDisks = $XML.SelectNodes("//ns:DiskSection/ns:Disk[contains(@ovf:diskId,'vmdisk')]", $NS)
+    $DiskId = 1
+    While ($XMLDisks.DiskId -contains "vmdisk$($DiskId)") {
+        $DiskId++
+    }
+
+    # Add new 'Disk' node (under 'DiskSection')
+    $XMLDisk = $XML.CreateElement('Disk', $XML.DocumentElement.xmlns)
+    $PowersMap = @{
+        KB = 10
+        MB = 20
+        GB = 30
+        TB = 40
+        PB = 50
+    }
+    If ($PowersMap.Keys -notcontains $Disk.UnitSize) {
+        # Invalid UnitSize; skipping adding new disk
+        Continue
+    }
+
+    [void]$XMLDisk.SetAttribute('capacityAllocationUnits', $NS.LookupNamespace('ovf'), "byte * 2^$($PowersMap[$Disk.UnitSize])")
+    [void]$XMLDisk.SetAttribute('format', $NS.LookupNamespace('ovf'), 'http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized')
+    [void]$XMLDisk.SetAttribute('diskId', $NS.LookupNamespace('ovf'), "vmdisk$($DiskId)")
+    [void]$XMLDisk.SetAttribute('capacity', $NS.LookupNamespace('ovf'), '${{vmconfig.disksize.{0}}}' -f $DiskId)
+    [void]$XMLDisk.SetAttribute('populatedSize', $NS.LookupNamespace('ovf'), 0)
+    [void]$XML.SelectSingleNode('//ns:DiskSection', $NS).AppendChild($XMLDisk)
+
+    # Add new 'Item/ResourceType' node (under 'VirtualHardwareSection')
+    $XMLDiskItem = $XMLDiskTemplate.CloneNode($True)
+    $XMLDiskItem.SelectSingleNode('rasd:AddressOnParent', $NS).InnerText = ($DiskId - 1)
+    $XMLDiskItem.SelectSingleNode('rasd:ElementName', $NS).InnerText = "Hard Disk $($DiskId)"
+    $XMLDiskItem.SelectSingleNode('rasd:HostResource', $NS).InnerText = "ovf:/disk/vmdisk$($DiskId)"
+    # Determine next free available and highest 'InstanceID'
+    $InstanceIDs = $XML.SelectNodes('//ns:VirtualHardwareSection/ns:Item/rasd:InstanceID', $NS).InnerText
+    $InstanceID = 1
+    While ($InstanceIDs -contains $InstanceID) {
+        $InstanceID++
+    }
+    $HighestInstanceID = ($InstanceIDs | Measure-Object -Maximum).Maximum
+    $XMLDiskItem.SelectSingleNode('rasd:InstanceID', $NS).InnerText = $InstanceID
+    [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+        $XMLDiskItem,
+        $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:InstanceID[.='$($HighestInstanceID)']", $NS).ParentNode
+    )
+
+    $OVFConfig.PropertyCategories[0].ProductProperties += @{
+        Key              = "vmconfig.disksize.$($DiskId)"
+        Type             = If ([boolean]$Disk.Constraints.Minimum -or [boolean]$Disk.Constraints.Maximum) {
+                "Int($($Disk.Constraints.Minimum)..$($Disk.Constraints.Maximum))"
+            }
+            Else {
+                'Int'
+            }
+        Label            = "Disk $($DiskId) size*"
+        Description      = "$($Disk.Description) (in $($Disk.UnitSize))".Trim()
+        DefaultValue     = "$($Disk.Constraints.Minimum)"
+        Configurations   = '*'
+        UserConfigurable = 'true'
+    }
+}
+Write-Host "Inserted $($OVFConfig.DynamicDisks.Count) new node(s) into 'DiskSection' and 'VirtualHardwareSection' respectively"

 If ($OVFConfig.DeploymentConfigurations.Count -gt 0) {
    $XMLSection = $XML.CreateElement('DeploymentOptionSection', $XML.DocumentElement.xmlns)
@ -40,36 +128,72 @@ If ($OVFConfig.DeploymentConfigurations.Count -gt 0) {
    ForEach ($Configuration in $OVFConfig.DeploymentConfigurations) {
        $XMLConfig = $XML.CreateElement('Configuration', $XML.DocumentElement.xmlns)
    
-        $XMLConfigAttrId = $XML.CreateAttribute('id', $XML.DocumentElement.ovf)
-        $XMLConfigAttrId.Value = $Configuration.Id
+        [void]$XMLConfig.SetAttribute('id', $NS.LookupNamespace('ovf'), $Configuration.Id)
    
        $XMLConfigLabel = $XML.CreateElement('Label', $XML.DocumentElement.xmlns)
        $XMLConfigLabel.InnerText = $Configuration.Label
-    
        $XMLConfigDescription = $XML.CreateElement('Description', $XML.DocumentElement.xmlns)
        $XMLConfigDescription.InnerText = $Configuration.Description
    
-        [void]$XMLConfig.Attributes.Append($XMLConfigAttrId)
        [void]$XMLConfig.AppendChild($XMLConfigLabel)
        [void]$XMLConfig.AppendChild($XMLConfigDescription)
    
        [void]$XMLSection.AppendChild($XMLConfig)
    }
-    [void]$XML.SelectSingleNode('//Any:Envelope', $NS).InsertAfter($XMLSection, $XML.SelectSingleNode('//Any:NetworkSection', $NS))
+    [void]$XML.SelectSingleNode('//ns:Envelope', $NS).InsertAfter($XMLSection, $XML.SelectSingleNode('//ns:NetworkSection', $NS))
    Write-Host "Inserted 'DeploymentOptionSection' with $($Configuration.Count) nodes"
+
+    If ($OVFConfig.DeploymentConfigurations.Count -eq $OVFConfig.DeploymentConfigurations.Size.Count) {
+        # Create copies of existing 'Item/ResourceType' nodes
+        $XMLCPUTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='3']", $NS).ParentNode.CloneNode($True)
+        $XMLMemoryTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='4']", $NS).ParentNode.CloneNode($True)
+        # Delete existing nodes
+        ForEach ($Node in $XML.SelectNodes("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='3' or .='4']", $NS).ParentNode) {
+            [void]$Node.ParentNode.RemoveChild($Node)
+        }
+        # Add adjusted 'Item/ResourceType' nodes
+        ForEach ($Configuration in $OVFConfig.DeploymentConfigurations) {
+            $XMLCPU = $XMLCPUTemplate.CloneNode($True)
+            [void]$XMLCPU.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Configuration.Id)
+            $XMLCPU.SelectSingleNode('rasd:ElementName', $NS).InnerText = '{0} virtual CPU(s)' -f $Configuration.Size.CPU
+            $XMLCPU.SelectSingleNode('rasd:VirtualQuantity', $NS).InnerText = $Configuration.Size.CPU
+
+            $XMLMemory = $XMLMemoryTemplate.CloneNode($True)
+            [void]$XMLMemory.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Configuration.Id)
+            $XMLMemory.SelectSingleNode('rasd:ElementName', $NS).InnerText = '{0}MB of memory' -f $Configuration.Size.Memory
+            $XMLMemory.SelectSingleNode('rasd:VirtualQuantity', $NS).InnerText = $Configuration.Size.Memory
+
+            [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+                $XMLCPU,
+                $XML.SelectSingleNode('//ns:VirtualHardwareSection/ns:System', $NS)
+            )
+            [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+                $XMLMemory,
+                $XML.SelectSingleNode('//ns:VirtualHardwareSection/ns:System', $NS)
+            )
+        }
+    }
 }

-$XMLAttrTransport = $XML.CreateAttribute('transport', $XML.DocumentElement.ovf)
-$XMLAttrTransport.Value = 'com.vmware.guestInfo'
-[void]$XML.SelectSingleNode('//Any:VirtualHardwareSection', $NS).Attributes.Append($XMLAttrTransport)
+[void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).SetAttribute('transport', $NS.LookupNamespace('ovf'), 'com.vmware.guestInfo')
+ForEach ($ExtraConfig in $OVFConfig.AdvancedOptions) {
+    $XMLExtraConfig = $XML.CreateElement('vmw:ExtraConfig', $XML.DocumentElement.vmw)

-$XMLProductSection = $XML.SelectSingleNode('//Any:ProductSection', $NS)
+    [void]$XMLExtraConfig.SetAttribute('required', $NS.LookupNamespace('ovf'), "$([boolean]$ExtraConfig.Required)".ToLower())
+    [void]$XMLExtraConfig.SetAttribute('key', $NS.LookupNamespace('vmw'), $ExtraConfig.Key)
+    [void]$XMLExtraConfig.SetAttribute('value', $NS.LookupNamespace('vmw'), $ExtraConfig.Value)
+
+    [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).AppendChild($XMLExtraConfig)
+}
+Write-Host "Added $($OVFConfig.AdvancedOptions.Count) 'vmw:ExtraConfig' node(s)"
+
+$XMLProductSection = $XML.SelectSingleNode('//ns:ProductSection', $NS)
 If ($XMLProductSection -eq $Null) {
    $XMLProductSection = $XML.CreateElement('ProductSection', $XML.DocumentElement.xmlns)
-    [void]$XML.SelectSingleNode('//Any:VirtualSystem', $NS).AppendChild($XMLProductSection)
+    [void]$XML.SelectSingleNode('//ns:VirtualSystem', $NS).AppendChild($XMLProductSection)
    Write-Host "Inserted 'ProductSection'"
 } Else {
-    ForEach ($Child in $XMLProductSection.SelectNodes('//Any:ProductSection/child::*', $NS)) {
+    ForEach ($Child in $XMLProductSection.SelectNodes('//ns:ProductSection/child::*', $NS)) {
        [void]$Child.ParentNode.RemoveChild($Child)
    }
    Write-Host "Destroyed pre-existing children in 'ProductSection'"
@ -90,85 +214,65 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
    ForEach ($Property in $Category.ProductProperties) {
        $XMLProperty = $XML.CreateElement('Property', $XML.DocumentElement.xmlns)
    
-        $XMLPropertyAttrKey = $XML.CreateAttribute('key', $XML.DocumentElement.ovf)
-        $XMLPropertyAttrKey.Value = $Property.Key
-        $XMLPropertyAttrType = $XML.CreateAttribute('type', $XML.DocumentElement.ovf)
+        [void]$XMLProperty.SetAttribute('key', $NS.LookupNamespace('ovf'), $Property.Key)
        Switch -regex ($Property.Type) {
-            'boolean' {
-                $XMLPropertyAttrType.Value = 'boolean'
+            '^boolean' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'boolean')
            }
-            'int' {
-                $XMLPropertyAttrType.Value = 'uint8'
+            '^int' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'uint16')
                $Qualifiers = @()
-                If ($Property.Type -match 'int\((\d*)\.\.(\d*)\)') {
+                If ($Property.Type -match '^int\((\d*)\.\.(\d*)\)') {
                    If ($Matches[1]) {
                        $Qualifiers += "MinValue($($Matches[1]))"
                    }
                    If ($Matches[2]) {
                        $Qualifiers += "MaxValue($($Matches[2]))"
                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
                }
            }
-            'ip' {
-                $XMLPropertyAttrType.Value = 'string'
-                $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.vmw)
-                $XMLPropertyAttrQualifiers.Value = 'Ip'
-                [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
+            '^ip' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('vmw'), 'Ip')
            }
-            'password' {
-                $XMLPropertyAttrType.Value = 'string'
-                $XMLPropertyAttrPassword = $XML.CreateAttribute('password', $XML.DocumentElement.ovf)
-                $XMLPropertyAttrPassword.Value = 'true'
-                [void]$XMLProperty.Attributes.Append($XMLPropertyAttrPassword)
+            '^password' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                [void]$XMLProperty.SetAttribute('password', $NS.LookupNamespace('ovf'), 'true')
+                $Qualifiers = @()
+                If ($Property.Type -match '^password\((\d*)\.\.(\d*)\)') {
+                    If ($Matches[1]) {
+                        $Qualifiers += "MinLen($($Matches[1]))"
+                    }
+                    If ($Matches[2]) {
+                        $Qualifiers += "MaxLen($($Matches[2]))"
+                    }
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
+                }
+            }
+            '^string' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                $Qualifiers = @()
+                If ($Property.Type -match '^string\((\d*)\.\.(\d*)\)') {
+                    If ($Matches[1]) {
+                        $Qualifiers += "MinLen($($Matches[1]))"
+                    }
+                    If ($Matches[2]) {
+                        $Qualifiers += "MaxLen($($Matches[2]))"
+                    }
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
+                } ElseIf ($Property.Type -match '^string\[(.*)\]') {
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), "ValueMap{$($Matches[1] -replace '","', '", "')}")
+                }
+            }
+        }
+        [void]$XMLProperty.SetAttribute('userConfigurable', $NS.LookupNamespace('ovf'), "$([boolean]$Property.UserConfigurable)".ToLower())

-                $Qualifiers = @()
-                If ($Property.Type -match 'password\((\d*)\.\.(\d*)\)') {
-                    If ($Matches[1]) {
-                        $Qualifiers += "MinLen($($Matches[1]))"
-                    }
-                    If ($Matches[2]) {
-                        $Qualifiers += "MaxLen($($Matches[2]))"
-                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                }
-            }
-            'string' {
-                $XMLPropertyAttrType.Value = 'string'
-                $Qualifiers = @()
-                If ($Property.Type -match 'string\((\d*)\.\.(\d*)\)') {
-                    If ($Matches[1]) {
-                        $Qualifiers += "MinLen($($Matches[1]))"
-                    }
-                    If ($Matches[2]) {
-                        $Qualifiers += "MaxLen($($Matches[2]))"
-                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                } ElseIf ($Property.Type -match 'string\[(.*)\]') {
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = "ValueMap{$($Matches[1] -replace '","', '", "')}"
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                }
-            }
-        }
-        $XMLPropertyAttrUserConfigurable = $XML.CreateAttribute('userConfigurable', $XML.DocumentElement.ovf)
-        $XMLPropertyAttrUserConfigurable.Value = "$([boolean]$Property.UserConfigurable)".ToLower()
-        $XMLPropertyAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
        If ($Property.Type -eq 'boolean') {
-            $XMLPropertyAttrValue.Value = "$([boolean]$Property.DefaultValue)".ToLower()
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), "$([boolean]$Property.DefaultValue)".ToLower())
        } Else {
-            $XMLPropertyAttrValue.Value = $Property.DefaultValue
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), $Property.DefaultValue)
        }
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrKey)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrType)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrUserConfigurable)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrValue)

        If ($Property.Label) {
            $XMLPropertyLabel = $XML.CreateElement('Label', $XML.DocumentElement.xmlns)
@ -182,30 +286,19 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
        }

        If (($Property.Configurations.Count -eq 1) -and ($Property.Configurations -eq '*')) {
-            $XMLPropertyAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrConfiguration.Value = $OVFConfig.DeploymentConfigurations.Id -join ' '
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrConfiguration)       
+            [void]$XMLProperty.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $OVFConfig.DeploymentConfigurations.Id -join ' ')
        } ElseIf ($Property.Configurations.Count -gt 0) {
-            $XMLPropertyAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrConfiguration.Value = $Property.Configurations -join ' '
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrConfiguration)       
+            [void]$XMLProperty.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Property.Configurations -join ' ')
        }

        If ($Property.Value.Count -eq 1) {
-            $XMLPropertyAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrValue.Value = $Property.Value
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrValue)       
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), $Property.Value)
        } ElseIf ($Property.Value.Count -gt 1) {
            ForEach ($Value in $Property.Value) {
                $XMLValue = $XML.CreateElement('Value', $XML.DocumentElement.xmlns)

-                $XMLValueAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
-                $XMLValueAttrValue.Value = $Value
-                $XMLValueAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-                $XMLValueAttrConfiguration.Value = $Value
-
-                [void]$XMLValue.Attributes.Append($XMLValueAttrValue)
-                [void]$XMLValue.Attributes.Append($XMLValueAttrConfiguration)
+                [void]$XMLValue.SetAttribute('value', $NS.LookupNamespace('ovf'), $Value)
+                [void]$XMLValue.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Value)

                [void]$XMLProperty.AppendChild($XMLValue)
            }
@ -216,4 +309,4 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
    Write-Host "Inserted $($Category.ProductProperties.Count) new node(s) into 'ProductSection'"
 }

-$XML.Save($SourceFile.FullName)
+$XML.Save($SourceFile.FullName)
--- a/scripts/Update-OvfConfiguration.yml
+++ b/scripts/Update-OvfConfiguration.yml
@ -1,5 +1,26 @@
-DeploymentConfigurations: []
+DeploymentConfigurations:
+- Id: small
+  Label: 'Ubuntu Server 20.04 [SMALL: 1 vCPU/2GB RAM]'
+  Description: Ubuntu Server 20.04.x
+  Size:
+    CPU: 1
+    Memory: 2048
+- Id: large
+  Label: 'Ubuntu Server 20.04 [LARGE: 4 vCPU/8GB RAM]'
+  Description: Ubuntu Server 20.04.x
+  Size:
+    CPU: 4
+    Memory: 8192
+DynamicDisks: []
 PropertyCategories:
+# - Name: 0) Deployment information
+#   ProductProperties:
+#   - Key: deployment.type
+#     Type: string
+#     Value:
+#     - small
+#     - large
+#     UserConfigurable: false
 - Name: 1) Operating System
  ProductProperties:
  - Key: guestinfo.hostname
@ -7,6 +28,28 @@ PropertyCategories:
    Label: Hostname*
    Description: '(max length: 15 characters)'
    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.rootpw
+    Type: password(7..)
+    Label: Local root password*
+    Description: ''
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.rootsshkey
+    Type: password(1..)
+    Label: Local root SSH public key*
+    Description: This line should start with 'ssh-rsa AAAAB3N'
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.ntpserver
+    Type: string(1..)
+    Label: Time server*
+    Description: A comma-separated list of timeservers
+    DefaultValue: 0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org
+    Configurations: '*'
    UserConfigurable: true
 - Name: 2) Networking
  ProductProperties:
@ -15,22 +58,42 @@ PropertyCategories:
    Label: IP Address*
    Description: ''
    DefaultValue: ''
+    Configurations: '*'
    UserConfigurable: true
  - Key: guestinfo.prefixlength
    Type: int(8..32)
    Label: Subnet prefix length*
    Description: ''
    DefaultValue: '24'
+    Configurations: '*'
    UserConfigurable: true
  - Key: guestinfo.dnsserver
    Type: ip
    Label: DNS server*
    Description: ''
    DefaultValue: ''
+    Configurations: '*'
    UserConfigurable: true
  - Key: guestinfo.gateway
    Type: ip
    Label: Gateway*
    Description: ''
    DefaultValue: ''
+    Configurations: '*'
    UserConfigurable: true
+AdvancedOptions:
+- Key: appliance.name
+  Value: "{{ appliance.name }}"
+  Required: false
+- Key: appliance.version
+  Value: "{{ appliance.version }}"
+  Required: false
+
+---
+Variables:
+- Name: appliance.name
+  Expression: |
+    $Parameter['appliance.name']
+- Name: appliance.version
+  Expression: |
+    $Parameter['appliance.version']
--- a/scripts/Windows10/01.Disabled
+++ b/scripts/Windows10/01.Disabled
@ -1,22 +0,0 @@
-# Retrieve all respective services (by ID)
-$GetServiceSplat = @{
-    Name = @(
-        'wuauserv'
-        'W3SVC',
-        'XboxGipSvc',
-        'XblGameSave'
-    )
-    ErrorAction = 'SilentlyContinue'
-}
-$Services = Get-Service @GetServiceSplat
-
-# Stop and disable all respective services
-ForEach ($Service in $Services) {
-    $SetServiceSplat = @{
-        Name        = $Service.Name
-        Status      = 'Stopped'
-        StartupType = 'Disabled'
-        ErrorAction = 'SilentlyContinue'
-    }
-    Set-Service @SetServiceSplat
-}
--- a/scripts/Windows10/02.Disable
+++ b/scripts/Windows10/02.Disable
@ -1,3 +0,0 @@
-$nic = get-netadapter
-
-Disable-NetAdapterBinding -InterfaceAlias $nic.name -ComponentID ms_tcpip6
--- a/scripts/Windows10/03.Power
+++ b/scripts/Windows10/03.Power
@ -1,15 +0,0 @@
-# Disable monitor timeout (plugged in/battery)
-#& powercfg /change monitor-timeout-ac 0
-#& powercfg /change monitor-timeout-dc 0
-
-# Disable disk timeout (plugged in/battery)
-#& powercfg /change disk-timeout-ac 0
-#& powercfg /change disk-timeout-dc 0
-
-# Disable standby timeout (plugged in/battery)
-& powercfg /change standby-timeout-ac 0
-& powercfg /change standby-timeout-dc 0
-
-# Disable hibernate timeout (plugged in/battery)
-& powercfg /change hibernate-timeout-ac 0
-& powercfg /change hibernate-timeout-dc 0
Author	SHA1	Message	Date
Danny Bessems	d29f7b3223	Update cloudinit network config All checks were successful continuous-integration/drone/push Build is passing Details	2022-08-24 15:27:20 +02:00
djpbessems	bd82e13fc4	Remove baremetal logic All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-25 13:35:30 +02:00
djpbessems	2f902fa27c	Rebase to newer ISO;Revert cloudinit config Some checks failed continuous-integration/drone/push Build is failing Details	2022-04-25 13:21:30 +02:00
djpbessems	37ecd4a1b9	Update password Some checks failed continuous-integration/drone/push Build is failing Details	2022-04-25 09:51:31 +02:00
djpbessems	8a8cb09984	Add cluster reference Some checks failed continuous-integration/drone/push Build is failing Details	2022-04-25 09:21:05 +02:00
djpbessems	bc46b09708	Update hypervisor details Some checks failed continuous-integration/drone/push Build is failing Details	2022-04-25 09:15:48 +02:00
djpbessems	d508b28213	Disable LVM Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-23 13:05:17 +02:00
djpbessems	03ed59680f	Remove debugging steps All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-17 14:14:11 +02:00
djpbessems	40ade38c78	Fix typo Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-17 13:52:11 +02:00
djpbessems	c89edd3ee9	FIx paths for postprocessor Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-17 13:15:51 +02:00
djpbessems	e5880c222e	Fix source names for only keys Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-17 11:35:48 +02:00
djpbessems	236db40016	Fix line continuators All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-17 11:23:57 +02:00
djpbessems	b340c777ba	Create rawdisk image for baremetal provisioning Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-17 11:21:22 +02:00
djpbessems	10624f8c90	Fix regex patterns	2021-06-15 11:11:56 +02:00
djpbessems	eca6ae515e	Fix Ansible loop All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-14 17:08:42 +02:00
djpbessems	b6656c3d9c	Fix SSH config;Housekeeping	2021-06-14 16:59:20 +02:00
djpbessems	82b8eeca4f	Add `jq` package	2021-06-14 13:41:27 +02:00
djpbessems	5af4d729ef	Add publickey vApp property;Configure SSH;Housekeeping All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-14 12:31:01 +02:00
djpbessems	73c266632c	Fix yamllint errors All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-11 14:50:53 +02:00
djpbessems	cd448a0af3	Disable login during deployment Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-11 14:44:43 +02:00
djpbessems	6b1db0dd23	Move user cleanup to firstboot script All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-10 17:08:07 +02:00
djpbessems	f15485e7c2	Fix password hashing;Delete temporary user;Housekeeping Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-10 16:53:03 +02:00
djpbessems	4257849ca4	Set password;Force reboot All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-10 15:07:48 +02:00
djpbessems	3426cd7ed3	Add absolute paths of executables All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-10 12:32:27 +02:00
djpbessems	226fa9859b	Change reference for local-var All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-10 11:53:51 +02:00
djpbessems	7e36abe0cb	Marking local-var as sensitive Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-10 11:52:11 +02:00
djpbessems	1e470f38dd	Fix quotes Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-10 11:44:45 +02:00
djpbessems	389c35bb05	Add logging to firstboot.sh Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-10 11:43:54 +02:00
djpbessems	f40889370d	Add logging;Move iso-file specifics to variable file;Housekeeping Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-10 11:39:42 +02:00
djpbessems	990534618b	Housekeeping;Disable crontab w/ reboot-followup All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-09 22:49:14 +02:00
djpbessems	c0953acefe	Add vApp xml parse logic All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-09 22:11:06 +02:00
djpbessems	b33280b443	Fix variable/tasks name All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-09 15:41:46 +02:00
djpbessems	9460bc9bd6	Rebase ansible installation source Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-09 14:39:43 +02:00
djpbessems	5f835960b9	Create destination folder for firstboot logic All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-09 11:04:05 +02:00
djpbessems	35c2df5f4e	Fix yamllint error Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-09 10:39:56 +02:00
djpbessems	fcdc7d07ad	Add ansible payload draft Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-09 10:39:00 +02:00
djpbessems	998f5ef381	Remove multiline descriptions for deployment options	2021-06-08 22:28:40 +02:00
djpbessems	a9041b19a4	Housekeeping	2021-06-08 22:16:52 +02:00
djpbessems	0a2647d465	Hide deprecation warnings	2021-06-08 22:13:46 +02:00
djpbessems	93cadce4fe	Move vars file All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-08 22:12:00 +02:00
djpbessems	4d7400ed43	Add missing cleanup script	2021-06-08 22:01:05 +02:00
djpbessems	f8d0c1cdde	Fix yamllint error Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 21:57:07 +02:00
djpbessems	4ea138fd69	Extend ansible roles #2 Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 21:56:06 +02:00
djpbessems	d5c3e2c0b6	Fix yamllint errors Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 21:27:59 +02:00
djpbessems	f33a99ad05	Extend ansible playbook Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 21:27:08 +02:00
djpbessems	d50bf402af	Decrease verbose logging for ansible provisioner	2021-06-08 17:10:52 +02:00
djpbessems	8adbec57d5	Reenable ansible tasks Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 17:00:56 +02:00
djpbessems	06d0a44c4d	Add explicit password for ansible provisioner Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 16:39:12 +02:00
djpbessems	be9609875a	Try different workaround #3 Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 15:26:41 +02:00
djpbessems	6c27d2e74d	Try different workaround Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 15:23:36 +02:00
djpbessems	346b2878a6	Try some random workarounds Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-06-08 15:13:12 +02:00
djpbessems	0ff31c104b	Try different tasks to get started with Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-06-08 14:42:42 +02:00
djpbessems	4bf036c49d	Add debugging info Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-06-08 13:51:22 +02:00
djpbessems	f6a27db822	Fix ansible.cfg header Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-06-08 13:26:48 +02:00
djpbessems	b9fb3cdb30	Configure ansible temporary folder Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 10:41:01 +02:00
djpbessems	d95daa1861	Add elevated permissions to ansible playbook;add post-processor scripts Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 10:14:10 +02:00
djpbessems	fcea2ef449	Reenable yamllint for ansible;Fix quotes Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 09:38:40 +02:00
djpbessems	d680b0dde4	Add ansible provisioner Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 09:24:39 +02:00
djpbessems	03b5338f59	Try several connection changes Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 16:25:50 +02:00
djpbessems	b7d737e7df	Add password as hashed value Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 16:01:11 +02:00
djpbessems	c4389f4932	Housekeeping Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 15:31:46 +02:00
djpbessems	bfa31fd7f7	Fix newline in yml Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:58:00 +02:00
djpbessems	94e1624180	Change credentials;Prevent/Delay SSH connectivity Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:54:22 +02:00
djpbessems	64ecc33dcb	Add missing file reference Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:44:50 +02:00
djpbessems	1da7269d87	Packer Abort vs cleanup debugging Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:35:16 +02:00
djpbessems	50bef57ff7	Include necessary empty file Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:19:32 +02:00
djpbessems	66e3c01863	Avoid globbing for cd_files key Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 14:17:03 +02:00
djpbessems	7b525a6ea8	Fix authentication keys in packer template Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:31:46 +02:00
djpbessems	6ae9003fec	Fix wrong variable reference Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:29:22 +02:00
djpbessems	7557a7bfca	Fix yaml errors Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:26:43 +02:00
djpbessems	5501c640fc	Ansible is not yet in place; skipping yamllint for that folder Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:25:45 +02:00
djpbessems	3f0a8ca3c4	Point yamllint to the correct folders/files Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:23:08 +02:00
djpbessems	04c9eb4f03	Add Ubuntu Server initial draft Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-07 13:19:00 +02:00
djpbessems	b75694479a	Migrate to HCL;Add 'packer init' step;Add variable definitions;Add debugging information All checks were successful continuous-integration/drone/push Build is passing Details	2021-06-05 19:34:31 +02:00
djpbessems	b304a17ee1	Change to Windows 10 Enterprise #2 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 18:23:23 +02:00
djpbessems	d155db26e7	Change to Windows 10 Enterprise Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-11 18:13:00 +02:00
djpbessems	b2f607e2b5	Enable builtin administrator (override default sysprep behaviour) All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-11 11:46:22 +02:00
djpbessems	465088b455	Fix staging directory All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-10 16:47:47 +02:00
djpbessems	3db5e7dbf7	Update hypervisor FQDN Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-10 15:35:15 +02:00
djpbessems	f84e065e15	Add pull policy Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-10 15:34:04 +02:00
djpbessems	00557e50f9	Replay sidestream changes Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-10 15:32:31 +02:00
djpbessems	e455419986	Update badge in README	2021-01-27 21:32:42 +01:00