From 27e7858a69c2f02d6bbd8e7e1f18d93c7d7048a4 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 17:57:56 +0200 Subject: [PATCH 01/21] break the tests --- tests/test_disk.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_disk.sh b/tests/test_disk.sh index 9d7da57..57e8403 100644 --- a/tests/test_disk.sh +++ b/tests/test_disk.sh @@ -12,3 +12,5 @@ spaceleft=$(parted ${dev} unit GB print free | grep 'Free Space' | tail -n1 | aw echo "${spaceleft%.*} in GB on ${dev}" test "${spaceleft%.*}" -lt "1" || ( echo "ERROR ${spaceleft%.*}GB free space on root device. Growpart not working" && exit 1 ) + +exit 1 From 05ea341cb88bfa0a9c44b8dc3626282cc94871c8 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:04:39 +0200 Subject: [PATCH 02/21] keep the tmp folder --- tmp/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 tmp/.gitkeep diff --git a/tmp/.gitkeep b/tmp/.gitkeep new file mode 100644 index 0000000..e69de29 From 568a425d8b3123fd54e1eaeaae391003cb722b17 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:20:26 +0200 Subject: [PATCH 03/21] fix: wrong target being used --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 48239e2..c770536 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,9 @@ ubuntu-release: ubuntu-release-20 ubuntu-release-22 rocky: manifests/d2iq-base-RockyLinux-8.7$(NAME_POSTFIX).json manifests/d2iq-base-RockyLinux-9.1$(NAME_POSTFIX).json rocky-test-87: manifests/tests/d2iq-base-RockyLinux-8.7$(NAME_POSTFIX).json.clean -rocky-test-87-clean: ubuntu-test-20 manifests/d2iq-base-RockyLinux-8.7$(NAME_POSTFIX).json.clean +rocky-test-87-clean: rocky-test-87 manifests/d2iq-base-RockyLinux-8.7$(NAME_POSTFIX).json.clean rocky-test-91: manifests/tests/d2iq-base-RockyLinux-9.1$(NAME_POSTFIX).json.clean -rocky-test-91-clean: ubuntu-test-20 manifests/d2iq-base-RockyLinux-9.1$(NAME_POSTFIX).json.clean +rocky-test-91-clean: rocky-test-91 manifests/d2iq-base-RockyLinux-9.1$(NAME_POSTFIX).json.clean rocky-test: rocky-test-87-clean rocky-test-91-clean rocky-release-87: rocky-test-87 release/d2iq-base-RockyLinux-8.7$(NAME_POSTFIX) rocky-release-91: rocky-test-91 release/d2iq-base-RockyLinux-9.1$(NAME_POSTFIX) From 9ee88fe71c251dd7df2e0356b417080be22fd4dc Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:20:51 +0200 Subject: [PATCH 04/21] fix: use old-releases as a stable resource --- images/base-Ubuntu-20.04.pkrvar.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/base-Ubuntu-20.04.pkrvar.hcl b/images/base-Ubuntu-20.04.pkrvar.hcl index 378a071..7f51669 100644 --- a/images/base-Ubuntu-20.04.pkrvar.hcl +++ b/images/base-Ubuntu-20.04.pkrvar.hcl @@ -1,4 +1,4 @@ distribution="Ubuntu" distribution_version="20.04" -iso_url="https://mirror.us.leaseweb.net/ubuntu-releases/20.04/ubuntu-20.04.5-live-server-amd64.iso" +iso_url="https://old-releases.ubuntu.com/releases/20.04.5/ubuntu-20.04.5-live-server-amd64.iso" iso_checksum="5035be37a7e9abbdc09f0d257f3e33416c1a0fb322ba860d42d74aa75c3468d4" From 4e0e5991411376358264bd20c5b3ecdd4f99fd58 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:27:13 +0200 Subject: [PATCH 05/21] fix: multiple updated distros --- images/base-RockyLinux-8.7.pkrvar.hcl | 2 +- images/base-RockyLinux-9.1.pkrvar.hcl | 2 +- images/base-Ubuntu-22.04.pkrvar.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/base-RockyLinux-8.7.pkrvar.hcl b/images/base-RockyLinux-8.7.pkrvar.hcl index 84c2c88..29337b7 100644 --- a/images/base-RockyLinux-8.7.pkrvar.hcl +++ b/images/base-RockyLinux-8.7.pkrvar.hcl @@ -1,4 +1,4 @@ distribution="RockyLinux" distribution_version="8.7" -iso_url="http://download.rockylinux.org/pub/rocky/8.7/isos/x86_64/Rocky-8.7-x86_64-minimal.iso" +iso_url="https://dl.rockylinux.org/vault/rocky/8.7/isos/x86_64/Rocky-8.7-x86_64-minimal.iso" iso_checksum="13c3e7fca1fd32df61695584baafc14fa28d62816d0813116d23744f5394624b" diff --git a/images/base-RockyLinux-9.1.pkrvar.hcl b/images/base-RockyLinux-9.1.pkrvar.hcl index 6894215..e71dd3b 100644 --- a/images/base-RockyLinux-9.1.pkrvar.hcl +++ b/images/base-RockyLinux-9.1.pkrvar.hcl @@ -1,4 +1,4 @@ distribution="RockyLinux" distribution_version="9.1" -iso_url="http://download.rockylinux.org/pub/rocky/9.1/isos/x86_64/Rocky-9.1-20221215.1-x86_64-minimal.iso" +iso_url="https://dl.rockylinux.org/vault/rocky/9.1/isos/x86_64/Rocky-9.1-20221215.1-x86_64-minimal.iso" iso_checksum="750c373c3206ae79784e436cc94fffc122296cf1bf8129a427dcd6ba7fac5888" diff --git a/images/base-Ubuntu-22.04.pkrvar.hcl b/images/base-Ubuntu-22.04.pkrvar.hcl index 4a1ced4..6733d3f 100644 --- a/images/base-Ubuntu-22.04.pkrvar.hcl +++ b/images/base-Ubuntu-22.04.pkrvar.hcl @@ -1,4 +1,4 @@ distribution="Ubuntu" distribution_version="22.04" -iso_url="https://mirror.us.leaseweb.net/ubuntu-releases/22.04/ubuntu-22.04.1-live-server-amd64.iso" +iso_url="https://old-releases.ubuntu.com/releases/22.04/ubuntu-22.04.1-live-server-amd64.iso" iso_checksum="10f19c5b2b8d6db711582e0e27f5116296c34fe4b313ba45f9b201a5007056cb" From 51bdd32746751dcbf83ddaf040ed6904d6542d31 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:31:30 +0200 Subject: [PATCH 06/21] fix: take every pr event --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a06d343..c3a8995 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,7 +3,6 @@ env: PRODUCT_VERSION: "1.8.6" on: pull_request: - types: [ labeled ] jobs: base_image_tests: runs-on: From e50c32f2ee64f5044075c5e1b3fe52ee3dd0c33d Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:55:13 +0200 Subject: [PATCH 07/21] fix: add dependencies --- .github/workflows/test.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c3a8995..9bd94cb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,8 +1,10 @@ name: test base images -env: - PRODUCT_VERSION: "1.8.6" on: pull_request: + types: + - labeled + - opened + - synchronize jobs: base_image_tests: runs-on: @@ -17,6 +19,9 @@ jobs: with: fetch-depth: 0 ref: ${{ github.ref }} + - name: Setup requirements + if: ${{ github.event.label.name == 'integration_test' }} + run: sudo apt-get update && sudo apt-get install xorriso - name: Run integration tests for ${{ matrix.os }} run: make ${{ matrix.os }}-test if: ${{ github.event.label.name == 'integration_test' }} From 853323d7e4c050868b014cdd1e94e1f7d8a7d0a3 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:57:40 +0200 Subject: [PATCH 08/21] improved conditions --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9bd94cb..aaeba33 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,11 +20,11 @@ jobs: fetch-depth: 0 ref: ${{ github.ref }} - name: Setup requirements - if: ${{ github.event.label.name == 'integration_test' }} + if: contains(github.event.pull_request.labels.*.name, 'integration_test') run: sudo apt-get update && sudo apt-get install xorriso - name: Run integration tests for ${{ matrix.os }} run: make ${{ matrix.os }}-test - if: ${{ github.event.label.name == 'integration_test' }} + if: contains(github.event.pull_request.labels.*.name, 'integration_test') env: VSPHERE_USERNAME: ${{ secrets.VSPHERE_SRE_USERNAME }} VSPHERE_PASSWORD: ${{ secrets.VSPHERE_SRE_PASSWORD }} From 307584a8a60ce6e36c74bf1a18ec5a0f13426e50 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 21 Aug 2023 18:58:56 +0200 Subject: [PATCH 09/21] fix: dependencies --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index aaeba33..f21dda2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.ref }} - name: Setup requirements if: contains(github.event.pull_request.labels.*.name, 'integration_test') - run: sudo apt-get update && sudo apt-get install xorriso + run: sudo apt-get update && sudo apt-get -y install xorriso - name: Run integration tests for ${{ matrix.os }} run: make ${{ matrix.os }}-test if: contains(github.event.pull_request.labels.*.name, 'integration_test') From 4c3ac4530132b6a189181179e0fcb4f97792f7cd Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 08:31:24 +0200 Subject: [PATCH 10/21] finish test --- tests/test_disk.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_disk.sh b/tests/test_disk.sh index 57e8403..9d7da57 100644 --- a/tests/test_disk.sh +++ b/tests/test_disk.sh @@ -12,5 +12,3 @@ spaceleft=$(parted ${dev} unit GB print free | grep 'Free Space' | tail -n1 | aw echo "${spaceleft%.*} in GB on ${dev}" test "${spaceleft%.*}" -lt "1" || ( echo "ERROR ${spaceleft%.*}GB free space on root device. Growpart not working" && exit 1 ) - -exit 1 From 0eaa534fb83d5d640daa038e4e4d1b4229e278b6 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 08:51:34 +0200 Subject: [PATCH 11/21] fix: add govc to build --- .github/workflows/test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f21dda2..dacae45 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,7 +21,9 @@ jobs: ref: ${{ github.ref }} - name: Setup requirements if: contains(github.event.pull_request.labels.*.name, 'integration_test') - run: sudo apt-get update && sudo apt-get -y install xorriso + run: | + sudo apt-get update && sudo apt-get -y install xorriso + curl -L -o - "https://github.com/vmware/govmomi/releases/latest/download/govc_$(uname -s)_$(uname -m).tar.gz" | sudo tar -C /usr/local/bin -xvzf - govc - name: Run integration tests for ${{ matrix.os }} run: make ${{ matrix.os }}-test if: contains(github.event.pull_request.labels.*.name, 'integration_test') From d572c8eb2abbfc6b91ec56e32d50cfb0ad3fb775 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 09:07:32 +0200 Subject: [PATCH 12/21] fix: datastore got renamed --- images/base-RHEL-79.pkrvar.hcl | 2 +- images/base-RHEL-84.pkrvar.hcl | 2 +- images/base-RHEL-86.pkrvar.hcl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/base-RHEL-79.pkrvar.hcl b/images/base-RHEL-79.pkrvar.hcl index 968e704..23f71e7 100644 --- a/images/base-RHEL-79.pkrvar.hcl +++ b/images/base-RHEL-79.pkrvar.hcl @@ -2,6 +2,6 @@ distribution="RHEL" distribution_version="7" # very specific for D2iQ internal setup. Please use PKR_VAR_iso_path_entry to match your setup. See README.md iso_paths= [ - "[ovh-nfs-services-only] isos/rhel-server-7.9-x86_64-dvd.iso" + "[ovh-nfs-vsphere-services] isos/rhel-server-7.9-x86_64-dvd.iso" ] iso_checksum="2cb36122a74be084c551bc7173d2d38a1cfb75c8ffbc1489c630c916d1b31b25" diff --git a/images/base-RHEL-84.pkrvar.hcl b/images/base-RHEL-84.pkrvar.hcl index b1890f4..8aa707a 100644 --- a/images/base-RHEL-84.pkrvar.hcl +++ b/images/base-RHEL-84.pkrvar.hcl @@ -2,6 +2,6 @@ distribution="RHEL" distribution_version="8" # very specific for D2iQ internal setup. Please use PKR_VAR_iso_path_entry to match your setup. See README.md iso_paths= [ - "[ovh-nfs-services-only] isos/rhel-8.4-x86_64-dvd.iso" + "[ovh-nfs-vsphere-services] isos/rhel-8.4-x86_64-dvd.iso" ] iso_checksum="ea5f349d492fed819e5086d351de47261c470fc794f7124805d176d69ddf1fcd" diff --git a/images/base-RHEL-86.pkrvar.hcl b/images/base-RHEL-86.pkrvar.hcl index 2552447..b7c71e4 100644 --- a/images/base-RHEL-86.pkrvar.hcl +++ b/images/base-RHEL-86.pkrvar.hcl @@ -2,6 +2,6 @@ distribution="RHEL" distribution_version="8" # very specific for D2iQ internal setup. Please use PKR_VAR_iso_path_entry to match your setup. See README.md iso_paths= [ - "[ovh-nfs-services-only] isos/rhel-8.6-x86_64-dvd.iso" + "[ovh-nfs-vsphere-services] isos/rhel-8.6-x86_64-dvd.iso" ] iso_checksum="8cb0dfacc94b789933253d5583a2fb7afce26d38d75be7c204975fe20b7bdf71" From 26d3156e3b7cd7d209598751d502c843d5cfa52b Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 10:20:09 +0200 Subject: [PATCH 13/21] RHN subscription secrets --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index dacae45..3fcf33a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,4 +37,5 @@ jobs: PKR_VAR_vsphere_datastore: ${{ secrets.VSPHERE_DATASTORE }} PKR_VAR_vsphere_network: ${{ secrets.VSPHERE_NETWORK }} PKR_VAR_vsphere_resource_pool: ${{ secrets.VSPHERE_RESOURCE_POOL }} - + RHN_SUBSCRIPTION_ORG: ${{ secrets.RHN_SUBSCRIPTION_ORG }} + RHN_SUBSCRIPTION_KEY: ${{ secrets.RHN_SUBSCRIPTION_KEY }} From 3703ccb7d8b17dc930fe6fb3e8f4dcfba206b78c Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 11:43:55 +0200 Subject: [PATCH 14/21] fix: wrong rhn variables --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3fcf33a..abc58f5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,5 +37,5 @@ jobs: PKR_VAR_vsphere_datastore: ${{ secrets.VSPHERE_DATASTORE }} PKR_VAR_vsphere_network: ${{ secrets.VSPHERE_NETWORK }} PKR_VAR_vsphere_resource_pool: ${{ secrets.VSPHERE_RESOURCE_POOL }} - RHN_SUBSCRIPTION_ORG: ${{ secrets.RHN_SUBSCRIPTION_ORG }} - RHN_SUBSCRIPTION_KEY: ${{ secrets.RHN_SUBSCRIPTION_KEY }} + RHN_USERNAME: ${{ secrets.RHN_SUBSCRIPTION_ORG }} + RHN_PASSWORD: ${{ secrets.RHN_SUBSCRIPTION_KEY }} From 636b4ed9fd7d387b2f94565bd524b34f3d58ec2c Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 13:38:38 +0200 Subject: [PATCH 15/21] Revert "fix: wrong rhn variables" This reverts commit 3703ccb7d8b17dc930fe6fb3e8f4dcfba206b78c. --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index abc58f5..3fcf33a 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,5 +37,5 @@ jobs: PKR_VAR_vsphere_datastore: ${{ secrets.VSPHERE_DATASTORE }} PKR_VAR_vsphere_network: ${{ secrets.VSPHERE_NETWORK }} PKR_VAR_vsphere_resource_pool: ${{ secrets.VSPHERE_RESOURCE_POOL }} - RHN_USERNAME: ${{ secrets.RHN_SUBSCRIPTION_ORG }} - RHN_PASSWORD: ${{ secrets.RHN_SUBSCRIPTION_KEY }} + RHN_SUBSCRIPTION_ORG: ${{ secrets.RHN_SUBSCRIPTION_ORG }} + RHN_SUBSCRIPTION_KEY: ${{ secrets.RHN_SUBSCRIPTION_KEY }} From 33fde704297d23d7ab429f97f0d7b6bd7a57c787 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 14:33:19 +0200 Subject: [PATCH 16/21] execute all in parallel --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3fcf33a..5607836 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: - self-hosted - small strategy: - max-parallel: 3 + fail-fast: false matrix: os: ["ubuntu", "rocky", "centos", "rhel"] steps: From 5b2e42e6930d23ae7f8986269057a1318fe5aebb Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 17:19:48 +0200 Subject: [PATCH 17/21] fix: rocky 8.7 is now in vault --- bootfiles/rocky/rocky-vault.ks | 87 ++++++++++++++++++++++++++++++++++ vsphere.pkr.hcl | 13 ++--- 2 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 bootfiles/rocky/rocky-vault.ks diff --git a/bootfiles/rocky/rocky-vault.ks b/bootfiles/rocky/rocky-vault.ks new file mode 100644 index 0000000..5233dee --- /dev/null +++ b/bootfiles/rocky/rocky-vault.ks @@ -0,0 +1,87 @@ +cdrom +# Use text mode install +text + +# License agreement +eula --agreed + +# System language +lang en_US.UTF-8 + +# Keyboard layout +keyboard --vckeymap=us --xlayouts='us' + +# repo setup +url --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/BaseOS/$basearch/os/ +repo --name=AppStream --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/AppStream/$basearch/os/ + +# Network information +network --bootproto=dhcp --device=link --activate + +### Lock the root account +rootpw --lock + +firewall --disabled + +# SELinux configuration +selinux --permissive + +# Do not configure the X Window System +skipx + +# System timezone +timezone UTC + +# Add a user named builder +user --name=${ssh_username} +sshkey --username=${ssh_username} "${public_key}" + +# System bootloader configuration +bootloader --location=mbr + +# Clear the Master Boot Record +zerombr + +clearpart --all --initlabel +part / --fstype="ext4" --grow --asprimary --label=slash --ondisk=sda + +%packages --excludedocs +# dnf group info minimal-environment +@^minimal-environment +@core +openssh-server +sed +sudo +python3 +open-vm-tools + +# Exclude unnecessary firmwares +-iwl*firmware +%end + +# Enable/disable the following services +services --enabled=sshd + +%post --logfile=/mnt/sysimage/root/ks-post.log --erroronfail +# Disable quiet boot and splash screen +sed --follow-symlinks -i "s/ rhgb quiet//" /etc/default/grub +sed --follow-symlinks -i "s/ rhgb quiet//" /boot/grub2/grubenv +# Passwordless sudo for the user '${ssh_username}' +echo "${ssh_username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/${ssh_username} +chmod 440 /etc/sudoers.d/${ssh_username} + +# Remove the package cache +dnf makecache +dnf install epel-release -y +dnf makecache +dnf install -y sudo open-vm-tools perl cloud-init cloud-utils-growpart + +# Disable swap +swapoff -a +rm -f /swapfile +sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab +sed -i '/^\(HWADDR\|UUID\)=/d' /etc/sysconfig/network-scripts/ifcfg-* || true +%end + +# Reboot after successful installation +reboot diff --git a/vsphere.pkr.hcl b/vsphere.pkr.hcl index 5264c9f..d62859a 100644 --- a/vsphere.pkr.hcl +++ b/vsphere.pkr.hcl @@ -200,12 +200,13 @@ locals { # lookup by - fallback to distro_version_bootfile_lookup = { - "RHEL-7" = "${path.root}/bootfiles/rhel/rhel7.ks" - "RHEL" = "${path.root}/bootfiles/rhel/rhel8.ks" - "RockyLinux" = "${path.root}/bootfiles/rocky/rocky.ks" - "CentOS" = "${path.root}/bootfiles/centos/centos7.ks" - "Ubuntu" = "${path.root}/bootfiles/ubuntu/autoinstall.yaml" - "Ubuntu-18.04" = "${path.root}/bootfiles/ubuntu/preseed.cfg" + "RHEL-7" = "${path.root}/bootfiles/rhel/rhel7.ks" + "RHEL" = "${path.root}/bootfiles/rhel/rhel8.ks" + "RockyLinux" = "${path.root}/bootfiles/rocky/rocky.ks" + "RockyLinux-8.7" = "${path.root}/bootfiles/rocky/rocky.ks" + "CentOS" = "${path.root}/bootfiles/centos/centos7.ks" + "Ubuntu" = "${path.root}/bootfiles/ubuntu/autoinstall.yaml" + "Ubuntu-18.04" = "${path.root}/bootfiles/ubuntu/preseed.cfg" } el_old_bootcommand = [ From 36309e96ec3c3441b08ac6f35a4da2fd6f0d50fc Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 17:25:54 +0200 Subject: [PATCH 18/21] use vault ks --- vsphere.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsphere.pkr.hcl b/vsphere.pkr.hcl index d62859a..b4c3df8 100644 --- a/vsphere.pkr.hcl +++ b/vsphere.pkr.hcl @@ -203,7 +203,7 @@ locals { "RHEL-7" = "${path.root}/bootfiles/rhel/rhel7.ks" "RHEL" = "${path.root}/bootfiles/rhel/rhel8.ks" "RockyLinux" = "${path.root}/bootfiles/rocky/rocky.ks" - "RockyLinux-8.7" = "${path.root}/bootfiles/rocky/rocky.ks" + "RockyLinux-8.7" = "${path.root}/bootfiles/rocky/rocky-vault.ks" "CentOS" = "${path.root}/bootfiles/centos/centos7.ks" "Ubuntu" = "${path.root}/bootfiles/ubuntu/autoinstall.yaml" "Ubuntu-18.04" = "${path.root}/bootfiles/ubuntu/preseed.cfg" From 9031c7bb5c1394cc5cfbc942ebcbd3a97b8353d0 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 17:37:33 +0200 Subject: [PATCH 19/21] arch variables don't seem to work here --- bootfiles/rocky/rocky-vault.ks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootfiles/rocky/rocky-vault.ks b/bootfiles/rocky/rocky-vault.ks index 5233dee..3e10269 100644 --- a/bootfiles/rocky/rocky-vault.ks +++ b/bootfiles/rocky/rocky-vault.ks @@ -12,8 +12,8 @@ lang en_US.UTF-8 keyboard --vckeymap=us --xlayouts='us' # repo setup -url --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/BaseOS/$basearch/os/ -repo --name=AppStream --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/AppStream/$basearch/os/ +url --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/BaseOS/x86_64/os/ +repo --name=AppStream --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/AppStream/x86_64/os/ # Network information network --bootproto=dhcp --device=link --activate From a74773d6cf47c3d76db38bd3d9e202a3ae7ec7d5 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 17:48:08 +0200 Subject: [PATCH 20/21] fix option typo --- bootfiles/rocky/rocky-vault.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootfiles/rocky/rocky-vault.ks b/bootfiles/rocky/rocky-vault.ks index 3e10269..b528a0e 100644 --- a/bootfiles/rocky/rocky-vault.ks +++ b/bootfiles/rocky/rocky-vault.ks @@ -13,7 +13,7 @@ keyboard --vckeymap=us --xlayouts='us' # repo setup url --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/BaseOS/x86_64/os/ -repo --name=AppStream --url=http://dl.rockylinux.org/vault/rocky/${distribution_version}/AppStream/x86_64/os/ +repo --name=AppStream --baseurl=http://dl.rockylinux.org/vault/rocky/${distribution_version}/AppStream/x86_64/os/ # Network information network --bootproto=dhcp --device=link --activate From 58a5672ebf04e9d61b61be54006fcf6c3ab4a6e1 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Tue, 22 Aug 2023 20:20:39 +0200 Subject: [PATCH 21/21] increase default ssh_timeout --- vsphere.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsphere.pkr.hcl b/vsphere.pkr.hcl index b4c3df8..54bb8bd 100644 --- a/vsphere.pkr.hcl +++ b/vsphere.pkr.hcl @@ -143,7 +143,7 @@ variable "firmware" { variable "ssh_timeout" { type = string - default = "10m" + default = "30m" } variable "ssh_username" {