Skip to content

[release-4.11] OCPBUGS-455: vsphere: fix default disk type when not speficied #6256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 9, 2022
Merged

[release-4.11] OCPBUGS-455: vsphere: fix default disk type when not speficied #6256

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions terraform/providers/vsphereprivate/resource_vsphereprivate_import_ova.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ func resourceVSpherePrivateImportOva() *schema.Resource {
},
"disk_type": {
Type: schema.TypeString,
Description: "The name of the disk provisioning, for e.g eagerZeroedThick or thin, by default it will be thick.",
Required: true,
Description: "The name of the disk provisioning type, valid values are thin, thick and eagerZeroedThick.",
Optional: true,
ForceNew: true,
},
},
Expand Down Expand Up @@ -361,21 +361,23 @@ func resourceVSpherePrivateImportOvaCreate(d *schema.ResourceData, meta interfac
Network: importOvaParams.Network.Reference(),
}}

var diskType types.OvfCreateImportSpecParamsDiskProvisioningType

if d.Get("disk_type") == "thin" {
diskType = types.OvfCreateImportSpecParamsDiskProvisioningTypeThin
} else if d.Get("disk_type") == "eagerZeroedThick" {
diskType = types.OvfCreateImportSpecParamsDiskProvisioningTypeEagerZeroedThick
} else {
diskType = types.OvfCreateImportSpecParamsDiskProvisioningTypeThick
}
// This is a very minimal spec for importing
// an OVF.
// This is a very minimal spec for importing an OVF.
cisp := types.OvfCreateImportSpecParams{
DiskProvisioning: string(diskType),
EntityName: d.Get("name").(string),
NetworkMapping: networkMappings,
EntityName: d.Get("name").(string),
NetworkMapping: networkMappings,
}

switch diskType := d.Get("disk_type"); diskType {
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.", diskType)
}

m := ovf.NewManager(client)
Expand Down