[RFC Don't Merge] Gophercloud resync

builder/openstack/access_config.go

@@ -6,17 +6,16 @@ import (
 	"net/http"
 	"os"
 
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/openstack"
 	"github.com/mitchellh/packer/template/interpolate"
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack"
 )
 
 // AccessConfig is for common configuration related to openstack access
 type AccessConfig struct {
 	Username         string `mapstructure:"username"`
 	UserID           string `mapstructure:"user_id"`
 	Password         string `mapstructure:"password"`
-	APIKey           string `mapstructure:"api_key"`
 	IdentityEndpoint string `mapstructure:"identity_endpoint"`
 	TenantID         string `mapstructure:"tenant_id"`
 	TenantName       string `mapstructure:"tenant_name"`
@@ -42,9 +41,6 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 	}
 
 	// Legacy RackSpace stuff. We're keeping this around to keep things BC.
-	if c.APIKey == "" {
-		c.APIKey = os.Getenv("SDK_API_KEY")
-	}
 	if c.Password == "" {
 		c.Password = os.Getenv("SDK_PASSWORD")
 	}
@@ -68,7 +64,6 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 		{&c.Username, &ao.Username},
 		{&c.UserID, &ao.UserID},
 		{&c.Password, &ao.Password},
-		{&c.APIKey, &ao.APIKey},
 		{&c.IdentityEndpoint, &ao.IdentityEndpoint},
 		{&c.TenantID, &ao.TenantID},
 		{&c.TenantName, &ao.TenantName},

builder/openstack/artifact.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/images"
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
 )
 
 // Artifact is an artifact implementation that contains built images.

builder/openstack/server.go

@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 // StateRefreshFunc is a function type used for StateChangeConf that is
@@ -38,7 +38,7 @@ func ServerStateRefreshFunc(
 	return func() (interface{}, string, int, error) {
 		serverNew, err := servers.Get(client, s.ID).Extract()
 		if err != nil {
-			errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError)
+			errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
 			if ok && errCode.Actual == 404 {
 				log.Printf("[INFO] 404 on ServerStateRefresh, returning DELETED")
 				return nil, "DELETED", 0, nil

builder/openstack/ssh.go

@@ -6,11 +6,11 @@ import (
 	"log"
 	"time"
 
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	packerssh "github.com/mitchellh/packer/communicator/ssh"
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -31,7 +31,7 @@ func CommHost(
 		}
 
 		// If we have a floating IP, use that
-		ip := state.Get("access_ip").(*floatingip.FloatingIP)
+		ip := state.Get("access_ip").(*floatingips.FloatingIP)
 		if ip != nil && ip.IP != "" {
 			log.Printf("[DEBUG] Using floating IP %s to connect", ip.IP)
 			return ip.IP, nil

builder/openstack/step_allocate_ip.go

@@ -3,10 +3,10 @@ package openstack
 import (
 	"fmt"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/floatingips"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 type StepAllocateIp struct {
@@ -27,7 +27,7 @@ func (s *StepAllocateIp) Run(state multistep.StateBag) multistep.StepAction {
 		return multistep.ActionHalt
 	}
 
-	var instanceIp floatingip.FloatingIP
+	var instanceIp floatingips.FloatingIP
 
 	// This is here in case we error out before putting instanceIp into the
 	// statebag below, because it is requested by Cleanup()
@@ -38,7 +38,7 @@ func (s *StepAllocateIp) Run(state multistep.StateBag) multistep.StepAction {
 	} else if s.FloatingIpPool != "" {
 		ui.Say(fmt.Sprintf("Creating floating IP..."))
 		ui.Message(fmt.Sprintf("Pool: %s", s.FloatingIpPool))
-		newIp, err := floatingip.Create(client, floatingip.CreateOpts{
+		newIp, err := floatingips.Create(client, floatingips.CreateOpts{
 			Pool: s.FloatingIpPool,
 		}).Extract()
 		if err != nil {
@@ -55,7 +55,9 @@ func (s *StepAllocateIp) Run(state multistep.StateBag) multistep.StepAction {
 	if instanceIp.IP != "" {
 		ui.Say(fmt.Sprintf("Associating floating IP with server..."))
 		ui.Message(fmt.Sprintf("IP: %s", instanceIp.IP))
-		err := floatingip.Associate(client, server.ID, instanceIp.IP).ExtractErr()
+		err := floatingips.AssociateInstance(client, server.ID, floatingips.AssociateOpts{
+			FloatingIP: instanceIp.IP,
+		}).ExtractErr()
 		if err != nil {
 			err := fmt.Errorf(
 				"Error associating floating IP %s with instance: %s",
@@ -76,7 +78,7 @@ func (s *StepAllocateIp) Run(state multistep.StateBag) multistep.StepAction {
 func (s *StepAllocateIp) Cleanup(state multistep.StateBag) {
 	config := state.Get("config").(Config)
 	ui := state.Get("ui").(packer.Ui)
-	instanceIp := state.Get("access_ip").(*floatingip.FloatingIP)
+	instanceIp := state.Get("access_ip").(*floatingips.FloatingIP)
 
 	// We need the v2 compute client
 	client, err := config.computeV2Client()
@@ -87,7 +89,7 @@ func (s *StepAllocateIp) Cleanup(state multistep.StateBag) {
 	}
 
 	if s.FloatingIpPool != "" && instanceIp.ID != "" {
-		if err := floatingip.Delete(client, instanceIp.ID).ExtractErr(); err != nil {
+		if err := floatingips.Delete(client, instanceIp.ID).ExtractErr(); err != nil {
 			ui.Error(fmt.Sprintf(
 				"Error deleting temporary floating IP %s", instanceIp.IP))
 			return

builder/openstack/step_create_image.go

@@ -5,11 +5,11 @@ import (
 	"log"
 	"time"
 
+	"github.com/gophercloud/gophercloud"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/images"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/images"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 type stepCreateImage struct{}
@@ -68,7 +68,7 @@ func WaitForImage(client *gophercloud.ServiceClient, imageId string) error {
 	for {
 		image, err := images.Get(client, imageId).Extract()
 		if err != nil {
-			errCode, ok := err.(*gophercloud.UnexpectedResponseCodeError)
+			errCode, ok := err.(*gophercloud.ErrUnexpectedResponseCode)
 			if ok && (errCode.Actual == 500 || errCode.Actual == 404) {
 				numErrors++
 				if numErrors >= maxNumErrors {

builder/openstack/step_get_password.go

@@ -6,10 +6,10 @@ import (
 	"log"
 	"time"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/helper/communicator"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 	"golang.org/x/crypto/ssh"
 )
 

builder/openstack/step_key_pair.go

@@ -8,10 +8,10 @@ import (
 	"os/exec"
 	"runtime"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/common/uuid"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"golang.org/x/crypto/ssh"
 )
 

builder/openstack/step_load_extensions.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions"
+	"github.com/gophercloud/gophercloud/pagination"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions"
-	"github.com/rackspace/gophercloud/pagination"
 )
 
 // StepLoadExtensions gets the FlavorRef from a Flavor. It first assumes

builder/openstack/step_load_flavor.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/flavors"
 )
 
 // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes

builder/openstack/step_run_source_server.go

@@ -5,10 +5,10 @@ import (
 	"io/ioutil"
 	"log"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 type StepRunSourceServer struct {
@@ -63,7 +63,7 @@ func (s *StepRunSourceServer) Run(state multistep.StateBag) multistep.StepAction
 		Networks:         networks,
 		AvailabilityZone: s.AvailabilityZone,
 		UserData:         userData,
-		ConfigDrive:      s.ConfigDrive,
+		ConfigDrive:      &s.ConfigDrive,
 	}
 
 	var serverOptsExt servers.CreateOptsBuilder

builder/openstack/step_stop_server.go

@@ -3,10 +3,10 @@ package openstack
 import (
 	"fmt"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/startstop"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 type StepStopServer struct{}

builder/openstack/step_wait_for_rackconnect.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/mitchellh/multistep"
 	"github.com/mitchellh/packer/packer"
-	"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
 )
 
 type StepWaitForRackConnect struct {