Update cloudinit network config

.drone.yml

@@ -14,32 +14,29 @@ steps:
 - name: Debugging information
   image: bv11-cr01.bessems.eu/library/packer-extended
   commands:
+  - yamllint --version
+  - packer --version
   - ansible --version
   - ovftool --version
-  - packer --version
+- name: Ubuntu Server 20.04
-  - yamllint --version
-- name: Kubernetes Bootstrap Appliance
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
   - |
     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-      packer/preseed/UbuntuServer22.04/user-data
+      packer/preseed/UbuntuServer20.04/user-data
   - |
     yamllint -d "{extends: relaxed, rules: {line-length: disable}}" \
       ansible \
-      packer/preseed/UbuntuServer22.04/user-data \
+      packer/preseed/UbuntuServer20.04/user-data \
       scripts
-  - |
-    ansible-galaxy install \
-      -r ansible/requirements.yml
   - |
     packer init -upgrade \
       ./packer
   - |
     packer validate \
       -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-      -var vm_guestos=k8sbootstrap \
+      -var vm_guestos=ubuntuserver20.04 \
       -var repo_username=$${REPO_USERNAME} \
       -var repo_password=$${REPO_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
@@ -49,7 +46,7 @@ steps:
     packer build \
       -on-error=cleanup -timestamp-ui \
       -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-      -var vm_guestos=k8sbootstrap \
+      -var vm_guestos=ubuntuserver20.04 \
       -var repo_username=$${REPO_USERNAME} \
       -var repo_password=$${REPO_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \

README.md

@@ -1 +1 @@
-# Packer.Images [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/Kubernetes.Bootstrap.Appliance)](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)

ansible/playbook.yml

@@ -1,11 +1,7 @@
 ---
 - hosts: all
   gather_facts: false
-  vars_files:
-    - metacluster.yml
   become: true
   roles:
     - os
     - firstboot
-    - appliance
-    - metacluster

ansible/requirements.yml

@@ -1,4 +0,0 @@
-collections:
-  - ansible.utils
-  - community.general
-  - kubernetes.core

ansible/roles/appliance/tasks/dependencies.archive_compressed.yml

@@ -1,27 +0,0 @@
----
-- name: Initialize tempfolder
-  ansible.builtin.tempfile:
-    state: directory
-  register: archive
-
-- name: Download & extract archived static binary
-  ansible.builtin.unarchive:
-    src: "{{ item.url }}"
-    dest: "{{ archive.path }}"
-    remote_src: yes
-    extra_opts: "{{ item.extra_opts | default(omit) }}"
-
-- name: Install extracted binary
-  ansible.builtin.copy:
-    src: "{{ archive.path }}/{{ item.filename }}"
-    dest: /usr/local/bin/{{ item.filename }}
-    remote_src: yes
-    owner: root
-    group: root
-    mode: 0755
-
-- name: Cleanup tempfolder
-  ansible.builtin.file:
-    path: "{{ archive.path }}"
-    state: absent
-  when: archive.path is defined

ansible/roles/appliance/tasks/dependencies.yml

@@ -1,46 +0,0 @@
-# - name: Create folder structure(s)
-#  ansible.builtin.file:
-#    path: "{{ item }}"
-#    state: directory
-#  loop:
-#    - /foo
-
-- name: Download & install static binaries
-  ansible.builtin.get_url:
-    url: "{{ item.url }}"
-    dest: /usr/local/bin/{{ item.filename }}
-    owner: root
-    group: root
-    mode: 0755
-  loop: "{{ dependencies.static_binaries | selectattr('archive', 'undefined') }}"
-  loop_control:
-    label: "{{ item.filename }}"
-
-- name: Download, extract & install archived static binaries
-  include_tasks: dependencies.archive_compressed.yml
-  loop: "{{ dependencies.static_binaries | rejectattr('archive', 'undefined') | selectattr('archive', 'equalto', 'compressed') }}"
-  loop_control:
-    label: "{{ item.filename }}"
-
-- name: Install ansible-galaxy collections
-  ansible.builtin.shell:
-    cmd: ansible-galaxy collection install {{ item }}
-  loop: "{{ dependencies.ansible_galaxy_collections }}"
-
-- name: Install distro packages
-  ansible.builtin.apt:
-    pkg: "{{ dependencies.packages }}"
-    state: latest
-    update_cache: yes
-    install_recommends: no
-
-- name: Upgrade all packages
-  ansible.builtin.apt:
-    name: '*'
-    state: latest
-    update_cache: yes
-
-- name: Cleanup apt cache
-  ansible.builtin.apt:
-    autoremove: yes
-    purge: yes

ansible/roles/appliance/tasks/main.yml

@@ -1,2 +0,0 @@
-- name: Install & configure dependencies
-  import_tasks: dependencies.yml

ansible/roles/firstboot/files/ansible_payload/playbook.yml

@@ -7,5 +7,4 @@
     - vapp
     - network
     - users
-    - metacluster
     - cleanup

ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/main.yml

@@ -1,18 +0,0 @@
-- name: Install K3s
-  ansible.builtin.command:
-    cmd: ./install.sh
-    chdir: /opt/metacluster/k3s
-  environment:
-    INSTALL_K3S_SKIP_DOWNLOAD: 'true'
-    INSTALL_K3S_EXEC: 'server --cluster-init'
-
-- name: Ensure API availability
-  ansible.utils.cli_parse:
-    command: curl -k https://{{ vapp['guestinfo.ipaddress'] }}:6443/livez?verbose
-    parser:
-      name: ansible.utils.json
-    set_fact: api_readycheck
-  ignore_errors: yes
-  until: api_readycheck.apiVersion is defined
-  retries: 3
-  delay: 30

ansible/roles/firstboot/tasks/main.yml

@@ -2,7 +2,6 @@
   ansible.builtin.file:
     path: /opt/firstboot
     state: directory
-
 - name: Create firstboot script file
   ansible.builtin.template:
     src: firstboot.j2
@@ -10,13 +9,11 @@
     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/
@@ -24,3 +21,6 @@
     owner: root
     group: root
     mode: '0644'
+- name: Install ansible-galaxy collection
+  ansible.builtin.shell:
+    cmd: ansible-galaxy collection install community.general

ansible/roles/metacluster/tasks/components.yml

@@ -1,49 +0,0 @@
-- name: Create folder structure(s)
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - /opt/metacluster/helm-charts
-    - /opt/metacluster/container-images
-
-- name: Add helm repositories
-  kubernetes.core.helm_repository:
-    name: "{{ item.name }}"
-    repo_url: "{{ item.url }}"
-    state: present
-  loop: "{{ platform.helm_repositories }}"
-
-- name: Fetch helm charts
-  ansible.builtin.command:
-    cmd: helm fetch {{ item.value.helm.chart }} --untar --version {{ item.value.helm.version }}
-    chdir: /opt/metacluster/helm-charts
-  loop: "{{ lookup('ansible.builtin.dict', components) }}"
-  loop_control:
-    label: "{{ item.key }}"
-
-- name: Parse helm charts for container images
-  ansible.builtin.shell:
-    cmd: helm template . | yq --no-doc eval '.. | .image? | select(.)' - | sort -u | awk '!/ /'
-    chdir: /opt/metacluster/helm-charts/{{ item.key }}
-  register: containerimages
-  loop: "{{ lookup('ansible.builtin.dict', components) }}"
-  loop_control:
-    label: "{{ item.key }}"
-
-- ansible.builtin.debug:
-    var: containerimages
-
-- name: Pull and store containerimages
-  ansible.builtin.command:
-    cmd: skopeo copy docker://{{ item }} docker-archive:./{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar:{{ item }}
-    chdir: /opt/metacluster/container-images
-  ignore_errors: yes
-  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}"
-
-- name: Compress tarballs
-  community.general.archive:
-    dest: /opt/metacluster/container-images/{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar.gz
-    path: /opt/metacluster/container-images/{{ ( item | regex_findall('[^/:]+'))[-2] }}.tar
-    remove: yes
-  ignore_errors: yes
-  loop: "{{ containerimages.results | map(attribute='stdout_lines') | flatten }}"

ansible/roles/metacluster/tasks/k3s.yml

@@ -1,28 +0,0 @@
-- name: Create folder structure(s)
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: directory
-  loop:
-    - /var/lib/rancher/k3s/agent/images
-    - /opt/metacluster/k3s
-
-- name: Download & install K3s binary
-  ansible.builtin.get_url:
-    url: https://github.com/k3s-io/k3s/releases/download/{{ platform.k3s.version }}/k3s
-    dest: /usr/local/bin/k3s
-    owner: root
-    group: root
-    mode: 0755
-
-- name: Download K3s images tarball
-  ansible.builtin.get_url:
-    url: https://github.com/k3s-io/k3s/releases/download/{{ platform.k3s.version }}/k3s-airgap-images-amd64.tar.gz
-    dest: /var/lib/rancher/k3s/agent/images
-
-- name: Download K3s install script
-  ansible.builtin.get_url:
-    url: https://get.k3s.io
-    dest: /opt/metacluster/k3s/install.sh
-    owner: root
-    group: root
-    mode: 0755

ansible/roles/metacluster/tasks/main.yml

@@ -1,4 +0,0 @@
-- name: Pre-stage K3s components
-  import_tasks: k3s.yml
-- name: Pre-stage meta components
-  import_tasks: components.yml

ansible/roles/os/tasks/packages.yml

@@ -1,16 +1,14 @@
 - name: Install additional packages
   ansible.builtin.apt:
-    pkg: "{{ packages }}"
+    name: "{{ item }}"
     state: latest
     update_cache: yes
-    install_recommends: no
+  loop: "{{ packages }}"
-
 - name: Upgrade all packages
   ansible.builtin.apt:
-    name: '*'
+    name: "*"
     state: latest
     update_cache: yes
-
 - name: Cleanup
   ansible.builtin.apt:
     autoremove: yes

ansible/vars/metacluster.yml

@@ -1,50 +0,0 @@
-platform:
-
-  k3s:
-    version: v1.24.1+k3s1
-
-  helm_repositories:
-    - name: longhorn
-      url: https://charts.longhorn.io
-    - name: harbor
-      url: https://helm.goharbor.io
-    - name: argo
-      url: https://argoproj.github.io/argo-helm
-
-components:
-
-  longhorn:
-    helm:
-      version: 1.3.0
-      chart: longhorn/longhorn
-      parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
-
-  harbor:
-    helm:
-      version: 1.9.1  # (= Harbor v2.5.1)
-      chart: harbor/harbor
-      parse_logic: yq e '.. | select(has("repository")) | .repository + ":" + .tag'
-
-  argo-cd:
-    helm:
-      version: 4.9.7  # (= ArgoCD v2.4.2)
-      chart: argo/argo-cd
-      parse_logic: yq e '.. | select(has("repository")) |= (with(select(.tag == "" or .tag == null); .repository + ":v2.4.2") | with(select(.tag != "" and .tag != null); .repository + ":" + .tag))'
-
-dependencies:
-
-  ansible_galaxy_collections:
-    - ansible.utils
-    - community.general
-    - kubernetes.core
-
-  static_binaries:
-    - filename: helm
-      url: https://get.helm.sh/helm-v3.9.0-linux-amd64.tar.gz
-      archive: compressed
-      extra_opts: --strip-components=1
-    - filename: yq
-      url: http://github.com/mikefarah/yq/releases/download/v4.25.3/yq_linux_amd64
-
-  packages:
-    - skopeo

packer/iso.auto.pkrvars.hcl

@@ -1,4 +1,4 @@
-iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2022.04/ubuntu-22.04-live-server-amd64.iso"
+iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2020.04/ubuntu-20.04.4-live-server-amd64.iso"
-iso_checksum = "sha256:84AEAF7823C8C61BAA0AE862D0A06B03409394800000B3235854A6B38EB4856F"
+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"

packer/ubuntuserver20.04.pkr.hcl

@@ -3,7 +3,7 @@ packer {
   }
 }
 
-source "vsphere-iso" "k8sbootstrap" {
+source "vsphere-iso" "ubuntuserver" {
   vcenter_server          = var.vcenter_server
   username                = var.vsphere_username
   password                = var.vsphere_password
@@ -20,9 +20,9 @@ source "vsphere-iso" "k8sbootstrap" {
 
   boot_order              = "disk,cdrom"
   boot_command            = [
-    "e<down><down><down><end>",
+    "<enter><wait2><enter><wait><f6><esc><wait>",
-    " autoinstall ds=nocloud;",
+    " autoinstall<wait2> ds=nocloud;",
-    "<F10>"
+    "<wait><enter>"
   ]
   boot_wait               = "2s"
 
@@ -48,8 +48,8 @@ source "vsphere-iso" "k8sbootstrap" {
   usb_controller          = ["xhci"]
 
   cd_files                = [
-    "packer/preseed/UbuntuServer22.04/user-data",
+    "packer/preseed/UbuntuServer20.04/user-data",
-    "packer/preseed/UbuntuServer22.04/meta-data"
+    "packer/preseed/UbuntuServer20.04/meta-data"
   ]
   cd_label                = "cidata"
   iso_url                 = local.iso_authenticatedurl
@@ -60,18 +60,18 @@ source "vsphere-iso" "k8sbootstrap" {
 
   export {
     images                = false
-    output_directory      = "/scratch/k8sbootstrap"
+    output_directory      = "/scratch/ubuntuserver"
   }
   remove_cdrom            = true
 }
 
 build {
   sources = [
-    "source.vsphere-iso.k8sbootstrap"
+    "source.vsphere-iso.ubuntuserver"
   ]
 
   provisioner "ansible" {
-    pause_before     = "2m30s"
+    only             = ["vsphere-iso.ubuntuserver"]
 
     playbook_file    = "ansible/playbook.yml"
     user             = "ubuntu"
@@ -85,15 +85,16 @@ build {
   }
 
   post-processor "shell-local" {
+    only   = ["vsphere-iso.ubuntuserver"]
     inline = [
       "pwsh -command \"& scripts/Update-OvfConfiguration.ps1 \\",
-      " -OVFFile '/scratch/k8sbootstrap/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " -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/k8sbootstrap/${var.vm_guestos}-${var.vm_name}.mf'",
+      " -ManifestFileName '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.mf'",
       "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
-      " '/scratch/k8sbootstrap/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.ovf' \\",
-      " /output/Kubernetes.Bootstrap.Appliance.ova"
+      " /output/Ubuntu-Server-20.04.ova"
     ]
   }
-}
+}