Merge pull request #8446 from jcpowermac/OCPBUGS-33561-OCPBUGS-33615

OCPBUGS-33561,OCPBUGS-33615: capv - missing cores/socket,disk type

Author: openshift-merge-bot[bot]

pkg/asset/machines/vsphere/capimachines.go

@@ -125,15 +125,16 @@ func GenerateMachines(ctx context.Context, clusterID string, config *types.Insta
 					Network: capv.NetworkSpec{
 						Devices: capvNetworkDevices,
 					},
-					Folder:       providerSpec.Workspace.Folder,
-					Template:     providerSpec.Template,
-					Datacenter:   providerSpec.Workspace.Datacenter,
-					Server:       providerSpec.Workspace.Server,
-					NumCPUs:      providerSpec.NumCPUs,
-					MemoryMiB:    providerSpec.MemoryMiB,
-					DiskGiB:      providerSpec.DiskGiB,
-					Datastore:    providerSpec.Workspace.Datastore,
-					ResourcePool: resourcePool,
+					Folder:            providerSpec.Workspace.Folder,
+					Template:          providerSpec.Template,
+					Datacenter:        providerSpec.Workspace.Datacenter,
+					Server:            providerSpec.Workspace.Server,
+					NumCPUs:           providerSpec.NumCPUs,
+					NumCoresPerSocket: providerSpec.NumCoresPerSocket,
+					MemoryMiB:         providerSpec.MemoryMiB,
+					DiskGiB:           providerSpec.DiskGiB,
+					Datastore:         providerSpec.Workspace.Datastore,
+					ResourcePool:      resourcePool,
 				},
 			},
 		}

pkg/infrastructure/vsphere/clusterapi/import.go

@@ -98,6 +98,19 @@ func importRhcosOva(ctx context.Context, session *session.Session, folder *objec
 		NetworkMapping: networkMappings,
 	}
 
+	switch diskProvisioningType {
+	case "":
+		// Disk provisioning type will be set according to the default storage policy of vsphere.
+	case "thin":
+		cisp.DiskProvisioning = string(types.OvfCreateImportSpecParamsDiskProvisioningTypeThin)
+	case "thick":
+		cisp.DiskProvisioning = string(types.OvfCreateImportSpecParamsDiskProvisioningTypeThick)
+	case "eagerZeroedThick":
+		cisp.DiskProvisioning = string(types.OvfCreateImportSpecParamsDiskProvisioningTypeEagerZeroedThick)
+	default:
+		return errors.Errorf("disk provisioning type %q is not supported", diskProvisioningType)
+	}
+
 	m := ovf.NewManager(session.Client.Client)
 	spec, err := m.CreateImportSpec(ctx,
 		string(ovfDescriptor),