Merge ac8a843 into 2513f02

sodafoundation · May 31, 2019 · b9aa089 · b9aa089
2 parents 2513f02 + ac8a843
commit b9aa089
Show file tree

Hide file tree

Showing 314 changed files with 60,800 additions and 15,795 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -67,7 +67,7 @@
 
 [[constraint]]
   name = "github.com/gophercloud/gophercloud"
-  revision = "754e57e7867bfa48062ff2a237caad538085700a"
+  revision = "3ad89c4ea008e0e0b729720040b0be25a35d4615"
 
 [[constraint]]
   name = "github.com/ceph/go-ceph"

diff --git a/contrib/drivers/openstack/cinder/cinder.go b/contrib/drivers/openstack/cinder/cinder.go
@@ -147,7 +147,7 @@ func (d *Driver) Setup() error {
 			return err
 		}
 
-		d.blockStoragev2, err = noauth.NewBlockStorageV2(provider, noauth.EndpointOpts{
+		d.blockStoragev2, err = noauth.NewBlockStorageNoAuth(provider, noauth.EndpointOpts{
 			CinderEndpoint: d.conf.CinderEndpoint,
 		})
 		if err != nil {
@@ -252,7 +252,7 @@ func (d *Driver) PullVolume(volID string) (*model.VolumeSpec, error) {
 // DeleteVolume
 func (d *Driver) DeleteVolume(req *pb.DeleteVolumeOpts) error {
 	cinderVolId := req.Metadata[KCinderVolumeId]
-	if err := volumesv2.Delete(d.blockStoragev2, cinderVolId).ExtractErr(); err != nil {
+	if err := volumesv2.Delete(d.blockStoragev2, cinderVolId, nil).ExtractErr(); err != nil {
 		log.Error("Cannot delete volume:", err)
 		return err
 	}

diff --git a/vendor/github.com/coreos/etcd/clientv3/client.go b/vendor/github.com/coreos/etcd/clientv3/client.go
diff --git a/vendor/github.com/go-ini/ini/ini.go b/vendor/github.com/go-ini/ini/ini.go
diff --git a/vendor/github.com/go-ini/ini/parser.go b/vendor/github.com/go-ini/ini/parser.go