Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit d6f1dcc

Browse files
Merge pull request #28 from dims/remove-cinder-defaults
Remove defaults and fix some logging
2 parents d3ce338 + b6f1202 commit d6f1dcc

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

pkg/cinder/controllerserver.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
4747

4848
// Volume Type
4949
volType := req.GetParameters()["type"]
50-
if len(volType) == 0 {
51-
volType = "lvmdriver-1"
52-
}
5350

5451
// Volume Availability - Default is nova
5552
volAvailability := req.GetParameters()["availability"]
56-
if len(volAvailability) == 0 {
57-
volAvailability = "nova"
58-
}
5953

6054
// Get OpenStack Provider
6155
cloud, err := openstack.GetOpenStackProvider()
@@ -96,7 +90,7 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol
9690
volID := req.GetVolumeId()
9791
err = cloud.DeleteVolume(volID)
9892
if err != nil {
99-
glog.V(3).Infof("Failed to CreateVolume: %v", err)
93+
glog.V(3).Infof("Failed to DeleteVolume: %v", err)
10094
return nil, err
10195
}
10296

0 commit comments

Comments
 (0)