provisioner: take fsType from the claim parameters

Signed-off-by: Roy Golan <[email protected]>
oVirt · Feb 5, 2018 · 310bd50 · 310bd50
1 parent a2de1b0
commit 310bd50
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/cmd/ovirt-provisioner/provision.go b/cmd/ovirt-provisioner/provision.go
@@ -66,17 +66,21 @@ func (p ovirtProvisioner) Provision(options controller.VolumeOptions) (*v1.Persi
 	// call ovirt api, create an unattached disk
 	capacity := options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
 	volSizeBytes := capacity.Value()
+	fsType, exists := options.Parameters["fsType"]
+	if !exists || fsType == "" {
+		fsType = "ext4"
+	}
 	glog.Infof("About to provision a disk name: %s domain: %s size: %v format: %s ",
 		options.PVName,
 		options.Parameters["ovirtStorageDomain"],
-		int(volSizeBytes),
+		volSizeBytes,
 		options.Parameters["ovirtDiskFormat"],
 	)
 	vol, err := p.ovirtClient.CreateUnattachedDisk(
 		options.PVName,
 		options.Parameters["ovirtStorageDomain"],
-		int(volSizeBytes), // TODO change the api to support int64 and not int
-		false,             // TODO support the PV Spec access mode?
+		volSizeBytes,
+		false, // TODO support the PV Spec access mode?
 		options.Parameters["ovirtDiskFormat"],
 	)
 	if err != nil {
@@ -91,8 +95,6 @@ func (p ovirtProvisioner) Provision(options controller.VolumeOptions) (*v1.Persi
 	labels := make(map[string]string)
 	labels[apis.LabelZoneFailureDomain] = "" // TODO A Zone is ovirt cluster?
 
-	//volSize := volumeOptions.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)]
-
 	pv := &v1.PersistentVolume{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        options.PVName,
@@ -112,6 +114,7 @@ func (p ovirtProvisioner) Provision(options controller.VolumeOptions) (*v1.Persi
 					Driver:   fmt.Sprintf("%s/%s", flexvolumeVendor, flexvolumeDriver),
 					Options:  map[string]string{},
 					ReadOnly: false, // TODO support PV spec access mode?
+					FSType:   fsType,
 				},
 			},
 		},