Merge pull request #32662 from humblec/glusterfs-default-volume

Automatic merge from submit-queue Change the default volume type of GlusterFS provisioner. At present provisioner creates 'Distribute' Volume and this patch change the default volume type 'Distribute Replica:(3)' volume.

Merge pull request #32662 from humblec/glusterfs-default-volume
9a342982 · Kubernetes Submit Queue · GitHub · e10b0618 · b4fd7e55 · 9a342982
Commit 9a342982 authored Sep 15, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 15, 2016
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

glusterfs.go pkg/volume/glusterfs/glusterfs.go +3 -1

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -55,6 +55,8 @@ var _ volume.Deleter = &glusterfsVolumeDeleter{}
 const (
 	glusterfsPluginName = "kubernetes.io/glusterfs"
 	volprefix           = "vol_"
+	replicacount        = 3
+	durabilitytype      = "replicate"
 )
 func (plugin *glusterfsPlugin) Init(host volume.VolumeHost) error {
@@ -467,7 +469,7 @@ func (p *glusterfsVolumeProvisioner) CreateVolume() (r *api.GlusterfsVolumeSourc
 		glog.Errorf("glusterfs: failed to create gluster rest client")
 		return nil, 0, fmt.Errorf("failed to create gluster REST client, REST server authentication failed")
 	}
-	volumeReq := &gapi.VolumeCreateRequest{Size: sz}
+	volumeReq := &gapi.VolumeCreateRequest{Size: sz, Durability: gapi.VolumeDurabilityInfo{Type: durabilitytype, Replicate: gapi.ReplicaDurability{Replica: replicacount}}}
 	volume, err := cli.VolumeCreate(volumeReq)
 	if err != nil {
 		glog.Errorf("glusterfs: error creating volume %s ", err)