Merge pull request #53588 from NickrenREN/openstack-deletevolume

Automatic merge from submit-queue (batch tested with PRs 52662, 53547, 53588, 53573, 53599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Return err when delete volume failed Return err when delete volume failed **Release note**: ```release-note NONE ``` /kind bug /sig openstack

Merge pull request #53588 from NickrenREN/openstack-deletevolume
e8ee831a · Kubernetes Submit Queue · GitHub · c12dab37 · dca47321 · e8ee831a
Commit e8ee831a authored Oct 09, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

openstack_volumes.go pkg/cloudprovider/providers/openstack/openstack_volumes.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_volumes.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_volumes.go
@@ -374,7 +374,7 @@ func (os *OpenStack) DeleteVolume(volumeID string) error {
 	if err != nil {
 		glog.Errorf("Cannot delete volume %s: %v", volumeID, err)
 	}
-	return nil
+	return err
 }