Merge pull request #39844 from screeley44/replica_bug

Automatic merge from submit-queue (batch tested with PRs 39807, 37505, 39844, 39525, 39109) fix bug not using volumetype config in create volume fixes #39843 @humblec we are building the volumetype config but I don't see where we are using it in the CreateVolume for dyn provisioning, this is why volumetype parameter from the Storage Class was being overlooked because we are hard coding constants like replicaCount which is always 3. unless I'm missing something?

Merge pull request #39844 from screeley44/replica_bug
823d760a · Kubernetes Submit Queue · GitHub · 6b5d82b5 · 164809c8 · 823d760a
Commit 823d760a authored Jan 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 13, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -710,7 +710,7 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsVolum
 		glog.V(4).Infof("glusterfs: provided clusterids: %v", clusterIds)
 	}
 	gid64 := int64(gid)
-	volumeReq := &gapi.VolumeCreateRequest{Size: sz, Clusters: clusterIds, Gid: gid64, Durability: gapi.VolumeDurabilityInfo{Type: durabilityType, Replicate: gapi.ReplicaDurability{Replica: replicaCount}}}
+	volumeReq := &gapi.VolumeCreateRequest{Size: sz, Clusters: clusterIds, Gid: gid64, Durability: p.volumeType}
 	volume, err := cli.VolumeCreate(volumeReq)
 	if err != nil {
 		glog.Errorf("glusterfs: error creating volume %v ", err)