Merge pull request #361 from jamiehannaford/cloud-dbs
[rfr] Rackspace Cloud Databases and OpenStack Trove services
diff --git a/.travis.yml b/.travis.yml
index bd9e4c6..325b90a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@
- 1.3
- 1.4
- 1.5
- - tip
script: script/cibuild
after_success:
- go get golang.org/x/tools/cmd/cover
diff --git a/openstack/compute/v2/extensions/bootfromvolume/requests.go b/openstack/compute/v2/extensions/bootfromvolume/requests.go
index c0ba368..c8edee0 100644
--- a/openstack/compute/v2/extensions/bootfromvolume/requests.go
+++ b/openstack/compute/v2/extensions/bootfromvolume/requests.go
@@ -99,6 +99,11 @@
return res
}
+ // Delete imageName and flavorName that come from ToServerCreateMap().
+ // As of Liberty, Boot From Volume is failing if they are passed.
+ delete(reqBody["server"].(map[string]interface{}), "imageName")
+ delete(reqBody["server"].(map[string]interface{}), "flavorName")
+
_, res.Err = client.Post(createURL(client), reqBody, &res.Body, &gophercloud.RequestOpts{
OkCodes: []int{200, 202},
})
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/requests.go b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
index 49d6f0b..29f752a 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/requests.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
@@ -102,6 +102,7 @@
// Populate request body
reqBody := request{FloatingIP: floatingIP{
FloatingNetworkID: opts.FloatingNetworkID,
+ FloatingIP: opts.FloatingIP,
PortID: opts.PortID,
FixedIP: opts.FixedIP,
TenantID: opts.TenantID,
diff --git a/provider_client.go b/provider_client.go
index d920913..e813e0e 100644
--- a/provider_client.go
+++ b/provider_client.go
@@ -192,6 +192,7 @@
if options.RawBody != nil {
options.RawBody.Seek(0, 0)
}
+ resp.Body.Close()
resp, err = client.Request(method, url, options)
if err != nil {
return nil, fmt.Errorf("Successfully re-authenticated, but got error executing request: %s", err)