From 5c84848c66cd8764a2624951fe515817694bc5fe Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Mon, 26 Aug 2024 18:37:06 +0530 Subject: [PATCH 1/3] Add support for VMware 8.0u2 (8.0.2.x) and 8.0u3 (8.0.3.x) --- .../src/main/resources/META-INF/db/schema-41910to42000.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql index 9abaa2c22dac..2b6682b25022 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql @@ -233,3 +233,9 @@ CALL `cloud`.`IDEMPOTENT_MODIFY_COLUMN_CHAR_SET`('vpc_offerings', 'unique_name', CALL `cloud`.`IDEMPOTENT_MODIFY_COLUMN_CHAR_SET`('vpc_offerings', 'display_text', 'VARCHAR(255)', 'DEFAULT NULL COMMENT \'display text\''); CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.roles','state', 'varchar(10) NOT NULL default "enabled" COMMENT "role state"'); + +-- Add support for VMware 8.0u2 (8.0.2.x) and 8.0u3 (8.0.3.x) +INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.2', 1024, 0, 59, 64, 1, 1); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid, hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '8.0.2', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='8.0'; +INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.3', 1024, 0, 59, 64, 1, 1); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid, hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '8.0.3', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='8.0'; From 78222b6dbedc242dc27ae2914148391ab942d748 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Fri, 30 Aug 2024 18:09:22 +0530 Subject: [PATCH 2/3] systemvm template changes, to explicitly update the module dependencies, vmware hardware version updated to 13, fsck added in grub --- systemvm/debian/opt/cloud/bin/setup/init.sh | 2 ++ tools/appliance/build.sh | 2 +- tools/appliance/systemvmtemplate/scripts/configure_grub.sh | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/setup/init.sh b/systemvm/debian/opt/cloud/bin/setup/init.sh index ae13700fffd1..5507193c4df3 100644 --- a/systemvm/debian/opt/cloud/bin/setup/init.sh +++ b/systemvm/debian/opt/cloud/bin/setup/init.sh @@ -112,6 +112,8 @@ config_guest() { fi ;; vmware) + # explicitly update the module dependencies + depmod -a # system time sync'd with host via vmware tools systemctl stop ntpd systemctl disable ntpd diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index 4865842d17b4..fa5d0e853cc6 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -235,7 +235,7 @@ function stage_vmx() { displayname = "${1}" annotation = "${1}" guestos = "otherlinux-64" -virtualHW.version = "11" +virtualHW.version = "13" config.version = "8" numvcpus = "1" cpuid.coresPerSocket = "1" diff --git a/tools/appliance/systemvmtemplate/scripts/configure_grub.sh b/tools/appliance/systemvmtemplate/scripts/configure_grub.sh index 231aa764449f..f9103925b3b7 100644 --- a/tools/appliance/systemvmtemplate/scripts/configure_grub.sh +++ b/tools/appliance/systemvmtemplate/scripts/configure_grub.sh @@ -34,7 +34,7 @@ function configure_grub() { GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_DISTRIBUTOR=Debian -GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX_DEFAULT="quiet fsck.mode=force fsck.repair=yes" GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US nomodeset" GRUB_CMDLINE_XEN="com1=115200 console=com1" GRUB_TERMINAL="console serial" From 7f84a0329ea6b299e9e39f7a5a2097265919afa0 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Wed, 4 Sep 2024 16:27:31 +0530 Subject: [PATCH 3/3] Revert "systemvm template changes, to explicitly update the module dependencies, vmware hardware version updated to 13, fsck added in grub" This reverts commit 78222b6dbedc242dc27ae2914148391ab942d748. --- systemvm/debian/opt/cloud/bin/setup/init.sh | 2 -- tools/appliance/build.sh | 2 +- tools/appliance/systemvmtemplate/scripts/configure_grub.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/setup/init.sh b/systemvm/debian/opt/cloud/bin/setup/init.sh index 5507193c4df3..ae13700fffd1 100644 --- a/systemvm/debian/opt/cloud/bin/setup/init.sh +++ b/systemvm/debian/opt/cloud/bin/setup/init.sh @@ -112,8 +112,6 @@ config_guest() { fi ;; vmware) - # explicitly update the module dependencies - depmod -a # system time sync'd with host via vmware tools systemctl stop ntpd systemctl disable ntpd diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index fa5d0e853cc6..4865842d17b4 100755 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -235,7 +235,7 @@ function stage_vmx() { displayname = "${1}" annotation = "${1}" guestos = "otherlinux-64" -virtualHW.version = "13" +virtualHW.version = "11" config.version = "8" numvcpus = "1" cpuid.coresPerSocket = "1" diff --git a/tools/appliance/systemvmtemplate/scripts/configure_grub.sh b/tools/appliance/systemvmtemplate/scripts/configure_grub.sh index f9103925b3b7..231aa764449f 100644 --- a/tools/appliance/systemvmtemplate/scripts/configure_grub.sh +++ b/tools/appliance/systemvmtemplate/scripts/configure_grub.sh @@ -34,7 +34,7 @@ function configure_grub() { GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_DISTRIBUTOR=Debian -GRUB_CMDLINE_LINUX_DEFAULT="quiet fsck.mode=force fsck.repair=yes" +GRUB_CMDLINE_LINUX_DEFAULT="quiet" GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8 console=hvc0 earlyprintk=xen net.ifnames=0 biosdevname=0 debian-installer=en_US nomodeset" GRUB_CMDLINE_XEN="com1=115200 console=com1" GRUB_TERMINAL="console serial"