Merge pull request openshift#844 from pospispa/bz1482273-switch-on-Sc…

…aleIO-volume-plugin Enable ScaleIO volume plugin.
sjenning · Aug 18, 2017 · fff2533 · fff2533
2 parents 3cb1594 + 846d2e5
commit fff2533
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/cmd/server/kubernetes/master/controller/volumes.go b/pkg/cmd/server/kubernetes/master/controller/volumes.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/kubernetes/pkg/volume/host_path"
 	"k8s.io/kubernetes/pkg/volume/nfs"
 	"k8s.io/kubernetes/pkg/volume/rbd"
+	"k8s.io/kubernetes/pkg/volume/scaleio"
 	"k8s.io/kubernetes/pkg/volume/vsphere_volume"
 )
 
@@ -153,6 +154,7 @@ func probeRecyclableVolumePlugins(config componentconfig.VolumeConfiguration, re
 	allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, azure_dd.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, scaleio.ProbeVolumePlugins()...)
 
 	return allPlugins, nil
 }