From 1e4cb8ad4a4ff52644b40bda5e20fa912ca09483 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 17 Jan 2025 11:26:47 +0300 Subject: [PATCH] Fix builds for MSVSphere 9.5 --- ansible/roles/gencloud_guest/tasks/main.yml | 2 ++ ansible/roles/nfs_client/tasks/main.yml | 1 + ansible/roles/qemu_guest_agent/tasks/main.yml | 1 + ansible/roles/setup_cloud_init/tasks/main.yml | 1 + ansible/roles/upgrade_and_reboot/tasks/main.yml | 1 + ansible/roles/vmware_guest/tasks/main.yml | 1 + ansible/roles/yandexcloud_guest/tasks/main.yml | 2 ++ http/msvsphere-9-gencloud.x86_64.ks | 4 ++-- variables.pkr.hcl | 10 +++++----- 9 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ansible/roles/gencloud_guest/tasks/main.yml b/ansible/roles/gencloud_guest/tasks/main.yml index 12271bc..1a1bcb4 100644 --- a/ansible/roles/gencloud_guest/tasks/main.yml +++ b/ansible/roles/gencloud_guest/tasks/main.yml @@ -1,6 +1,7 @@ --- - name: Remove firewalld and linux-firmware ansible.builtin.dnf: + # releasever: 9.5 name: - firewalld - firewalld-filesystem @@ -16,6 +17,7 @@ - name: Install additional software ansible.builtin.dnf: + # releasever: 9.5 name: - cockpit-system - cockpit-ws diff --git a/ansible/roles/nfs_client/tasks/main.yml b/ansible/roles/nfs_client/tasks/main.yml index d78d09b..6683579 100644 --- a/ansible/roles/nfs_client/tasks/main.yml +++ b/ansible/roles/nfs_client/tasks/main.yml @@ -1,5 +1,6 @@ --- - name: Install nfs-utils ansible.builtin.dnf: + # releasever: 9.5 name: nfs-utils state: present diff --git a/ansible/roles/qemu_guest_agent/tasks/main.yml b/ansible/roles/qemu_guest_agent/tasks/main.yml index 66eecbd..b1e971a 100644 --- a/ansible/roles/qemu_guest_agent/tasks/main.yml +++ b/ansible/roles/qemu_guest_agent/tasks/main.yml @@ -1,5 +1,6 @@ --- - name: Install qemu-guest-agent ansible.builtin.dnf: + # releasever: 9.5 name: qemu-guest-agent state: present diff --git a/ansible/roles/setup_cloud_init/tasks/main.yml b/ansible/roles/setup_cloud_init/tasks/main.yml index 2e6a4c5..236f176 100644 --- a/ansible/roles/setup_cloud_init/tasks/main.yml +++ b/ansible/roles/setup_cloud_init/tasks/main.yml @@ -1,5 +1,6 @@ - name: Install cloud-init ansible.builtin.dnf: + # releasever: 9.5 name: - cloud-init - cloud-utils-growpart diff --git a/ansible/roles/upgrade_and_reboot/tasks/main.yml b/ansible/roles/upgrade_and_reboot/tasks/main.yml index 047762a..ef48c6b 100644 --- a/ansible/roles/upgrade_and_reboot/tasks/main.yml +++ b/ansible/roles/upgrade_and_reboot/tasks/main.yml @@ -1,6 +1,7 @@ --- - name: Upgrade packages ansible.builtin.dnf: + # releasever: 9.5 name: '*' state: latest register: system_upgrade diff --git a/ansible/roles/vmware_guest/tasks/main.yml b/ansible/roles/vmware_guest/tasks/main.yml index 4da7833..0266a8e 100644 --- a/ansible/roles/vmware_guest/tasks/main.yml +++ b/ansible/roles/vmware_guest/tasks/main.yml @@ -1,5 +1,6 @@ --- - name: Install open-vm-tools ansible.builtin.dnf: + # releasever: 9.5 name: open-vm-tools state: present diff --git a/ansible/roles/yandexcloud_guest/tasks/main.yml b/ansible/roles/yandexcloud_guest/tasks/main.yml index 6122371..252eae7 100644 --- a/ansible/roles/yandexcloud_guest/tasks/main.yml +++ b/ansible/roles/yandexcloud_guest/tasks/main.yml @@ -1,6 +1,7 @@ --- - name: Remove firewalld and linux-firmware ansible.builtin.dnf: + # releasever: 9.5 name: - firewalld - firewalld-filesystem @@ -16,6 +17,7 @@ - name: Install additional software ansible.builtin.dnf: + # releasever: 9.5 name: - cockpit-system - cockpit-ws diff --git a/http/msvsphere-9-gencloud.x86_64.ks b/http/msvsphere-9-gencloud.x86_64.ks index 52c2e4a..3688bb9 100644 --- a/http/msvsphere-9-gencloud.x86_64.ks +++ b/http/msvsphere-9-gencloud.x86_64.ks @@ -25,8 +25,8 @@ bootloader --timeout=1 --location=mbr --append="console=tty0 console=ttyS0,11520 parted -s -a optimal /dev/sda -- mklabel gpt parted -s -a optimal /dev/sda -- mkpart biosboot 1MiB 2MiB set 1 bios_grub on parted -s -a optimal /dev/sda -- mkpart '"EFI System Partition"' fat32 2MiB 202MiB set 2 esp on -parted -s -a optimal /dev/sda -- mkpart boot xfs 202MiB 714MiB -parted -s -a optimal /dev/sda -- mkpart root xfs 714MiB 100% +parted -s -a optimal /dev/sda -- mkpart boot xfs 202MiB 1226MiB +parted -s -a optimal /dev/sda -- mkpart root xfs 1226MiB 100% %end diff --git a/variables.pkr.hcl b/variables.pkr.hcl index dd68530..c97ad21 100644 --- a/variables.pkr.hcl +++ b/variables.pkr.hcl @@ -5,7 +5,7 @@ variable "os_version_9" { description = "The target MSVSphere 9 version" type = string - default = "9.4" + default = "9.5" } variable "os_version_8" { @@ -18,7 +18,7 @@ variable "os_version_8" { variable "iso_url_9_x86_64" { description = "MSVSphere 9 x86_64 installation ISO URL" type = string - default = "https://repo1.msvsphere-os.ru/msvsphere/9/isos/x86_64/MSVSphere-9.4-x86_64-netinstall.iso" + default = "https://repo1.msvsphere-os.ru/msvsphere/9/isos/x86_64/MSVSphere-9.5-x86_64-netinstall.iso" } variable "iso_url_8_x86_64" { @@ -30,7 +30,7 @@ variable "iso_url_8_x86_64" { variable "iso_checksum_9_x86_64" { description = "MSVSphere 9 x86_64 installation ISO checksum" type = string - default = "file:https://repo1.msvsphere-os.ru/msvsphere/9/isos/x86_64/MSVSphere-9.4-x86_64-netinstall.iso.CHECKSUM" + default = "file:https://repo1.msvsphere-os.ru/msvsphere/9/isos/x86_64/MSVSphere-9.5-x86_64-netinstall.iso.CHECKSUM" } variable "iso_checksum_8_x86_64" { @@ -185,7 +185,7 @@ variable "vnc_port_max" { variable "gencloud_disk_size" { description = "The VM disk size" type = string - default = "10G" + default = "11G" } variable "gencloud_boot_cmd_9_x86_64_uefi" { @@ -195,7 +195,7 @@ variable "gencloud_boot_cmd_9_x86_64_uefi" { "c", "linuxefi", " /images/pxeboot/vmlinuz", - " inst.stage2=hd:LABEL=MSVSphere-9-4-BaseOS-x86_64 ro", + " inst.stage2=hd:LABEL=MSVSphere-9-5-BaseOS-x86_64 ro", " inst.text biosdevname=0 net.ifnames=0", " inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/msvsphere-9-gencloud.x86_64.ks", "",