Fix builds for MSVSphere 9.5

master
Arkady L. Shane 1 week ago
parent 3762083786
commit 1e4cb8ad4a
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -1,6 +1,7 @@
--- ---
- name: Remove firewalld and linux-firmware - name: Remove firewalld and linux-firmware
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: name:
- firewalld - firewalld
- firewalld-filesystem - firewalld-filesystem
@ -16,6 +17,7 @@
- name: Install additional software - name: Install additional software
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: name:
- cockpit-system - cockpit-system
- cockpit-ws - cockpit-ws

@ -1,5 +1,6 @@
--- ---
- name: Install nfs-utils - name: Install nfs-utils
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: nfs-utils name: nfs-utils
state: present state: present

@ -1,5 +1,6 @@
--- ---
- name: Install qemu-guest-agent - name: Install qemu-guest-agent
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: qemu-guest-agent name: qemu-guest-agent
state: present state: present

@ -1,5 +1,6 @@
- name: Install cloud-init - name: Install cloud-init
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: name:
- cloud-init - cloud-init
- cloud-utils-growpart - cloud-utils-growpart

@ -1,6 +1,7 @@
--- ---
- name: Upgrade packages - name: Upgrade packages
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: '*' name: '*'
state: latest state: latest
register: system_upgrade register: system_upgrade

@ -1,5 +1,6 @@
--- ---
- name: Install open-vm-tools - name: Install open-vm-tools
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: open-vm-tools name: open-vm-tools
state: present state: present

@ -1,6 +1,7 @@
--- ---
- name: Remove firewalld and linux-firmware - name: Remove firewalld and linux-firmware
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: name:
- firewalld - firewalld
- firewalld-filesystem - firewalld-filesystem
@ -16,6 +17,7 @@
- name: Install additional software - name: Install additional software
ansible.builtin.dnf: ansible.builtin.dnf:
# releasever: 9.5
name: name:
- cockpit-system - cockpit-system
- cockpit-ws - cockpit-ws

@ -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 -- mklabel gpt
parted -s -a optimal /dev/sda -- mkpart biosboot 1MiB 2MiB set 1 bios_grub on 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 '"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 boot xfs 202MiB 1226MiB
parted -s -a optimal /dev/sda -- mkpart root xfs 714MiB 100% parted -s -a optimal /dev/sda -- mkpart root xfs 1226MiB 100%
%end %end

@ -5,7 +5,7 @@
variable "os_version_9" { variable "os_version_9" {
description = "The target MSVSphere 9 version" description = "The target MSVSphere 9 version"
type = string type = string
default = "9.4" default = "9.5"
} }
variable "os_version_8" { variable "os_version_8" {
@ -18,7 +18,7 @@ variable "os_version_8" {
variable "iso_url_9_x86_64" { variable "iso_url_9_x86_64" {
description = "MSVSphere 9 x86_64 installation ISO URL" description = "MSVSphere 9 x86_64 installation ISO URL"
type = string 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" { variable "iso_url_8_x86_64" {
@ -30,7 +30,7 @@ variable "iso_url_8_x86_64" {
variable "iso_checksum_9_x86_64" { variable "iso_checksum_9_x86_64" {
description = "MSVSphere 9 x86_64 installation ISO checksum" description = "MSVSphere 9 x86_64 installation ISO checksum"
type = string 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" { variable "iso_checksum_8_x86_64" {
@ -185,7 +185,7 @@ variable "vnc_port_max" {
variable "gencloud_disk_size" { variable "gencloud_disk_size" {
description = "The VM disk size" description = "The VM disk size"
type = string type = string
default = "10G" default = "11G"
} }
variable "gencloud_boot_cmd_9_x86_64_uefi" { variable "gencloud_boot_cmd_9_x86_64_uefi" {
@ -195,7 +195,7 @@ variable "gencloud_boot_cmd_9_x86_64_uefi" {
"c<wait>", "c<wait>",
"linuxefi", "linuxefi",
" /images/pxeboot/vmlinuz", " /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.text biosdevname=0 net.ifnames=0",
" inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/msvsphere-9-gencloud.x86_64.ks", " inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/msvsphere-9-gencloud.x86_64.ks",
"<enter>", "<enter>",

Loading…
Cancel
Save