Merge pull request #17650 from jsafrane/devel/cinder-format

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-20 22:18:25 -08:00
5 changed files with 5 additions and 157 deletions

View File

@@ -689,7 +689,7 @@ func validateCinderVolumeSource(cd *api.CinderVolumeSource, fldPath *field.Path)
if len(cd.VolumeID) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("volumeID"), ""))
}
if len(cd.FSType) == 0 || (cd.FSType != "ext3" && cd.FSType != "ext4") {
if len(cd.FSType) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("fsType"), ""))
}
return allErrs