From 92b6b5c387b4f090d55450b44ba1619d5a3eddef Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 12 Jun 2015 10:32:31 -0400
Subject: [PATCH] builder/openstack: can ref flavor by name

---
 builder/openstack/builder.go                  |  4 +-
 builder/openstack/step_load_flavor.go         | 61 +++++++++++++++++++
 builder/openstack/step_run_source_server.go   |  8 ++-
 .../docs/builders/openstack.html.markdown     |  2 +-
 4 files changed, 70 insertions(+), 5 deletions(-)
 create mode 100644 builder/openstack/step_load_flavor.go

diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index bebb28452..d30ede8d3 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -67,13 +67,15 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 
 	// Build the steps
 	steps := []multistep.Step{
+		&StepLoadFlavor{
+			Flavor: b.config.Flavor,
+		},
 		&StepKeyPair{
 			Debug:        b.config.PackerDebug,
 			DebugKeyPath: fmt.Sprintf("os_%s.pem", b.config.PackerBuildName),
 		},
 		&StepRunSourceServer{
 			Name:           b.config.ImageName,
-			Flavor:         b.config.Flavor,
 			SourceImage:    b.config.SourceImage,
 			SecurityGroups: b.config.SecurityGroups,
 			Networks:       b.config.Networks,
diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go
new file mode 100644
index 000000000..8b8cae994
--- /dev/null
+++ b/builder/openstack/step_load_flavor.go
@@ -0,0 +1,61 @@
+package openstack
+
+import (
+	"fmt"
+	"log"
+
+	"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
+// that the Flavor is a ref and verifies it. Otherwise, it tries to find
+// the flavor by name.
+type StepLoadFlavor struct {
+	Flavor string
+}
+
+func (s *StepLoadFlavor) Run(state multistep.StateBag) multistep.StepAction {
+	config := state.Get("config").(Config)
+	ui := state.Get("ui").(packer.Ui)
+
+	// We need the v2 compute client
+	client, err := config.computeV2Client()
+	if err != nil {
+		err = fmt.Errorf("Error initializing compute client: %s", err)
+		state.Put("error", err)
+		return multistep.ActionHalt
+	}
+
+	ui.Say(fmt.Sprintf("Loading flavor: %s", s.Flavor))
+	log.Printf("[INFO] Loading flavor by ID: %s", s.Flavor)
+	flavor, err := flavors.Get(client, s.Flavor).Extract()
+	if err != nil {
+		log.Printf("[ERROR] Failed to find flavor by ID: %s", err)
+		geterr := err
+
+		log.Printf("[INFO] Loading flavor by name: %s", s.Flavor)
+		id, err := flavors.IDFromName(client, s.Flavor)
+		if err != nil {
+			log.Printf("[ERROR] Failed to find flavor by name: %s", err)
+			err = fmt.Errorf(
+				"Unable to find specified flavor by ID or name!\n\n"+
+					"Error from ID lookup: %s\n\n"+
+					"Error from name lookup: %s",
+				geterr,
+				err)
+			state.Put("error", err)
+			return multistep.ActionHalt
+		}
+
+		flavor = &flavors.Flavor{ID: id}
+	}
+
+	ui.Message(fmt.Sprintf("Verified flavor. ID: %s", flavor.ID))
+	state.Put("flavor_id", flavor.ID)
+	return multistep.ActionContinue
+}
+
+func (s *StepLoadFlavor) Cleanup(state multistep.StateBag) {
+}
diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go
index 4432d5860..89d816297 100644
--- a/builder/openstack/step_run_source_server.go
+++ b/builder/openstack/step_run_source_server.go
@@ -11,7 +11,6 @@ import (
 )
 
 type StepRunSourceServer struct {
-	Flavor         string
 	Name           string
 	SourceImage    string
 	SecurityGroups []string
@@ -22,6 +21,7 @@ type StepRunSourceServer struct {
 
 func (s *StepRunSourceServer) Run(state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(Config)
+	flavor := state.Get("flavor_id").(string)
 	keyName := state.Get("keyPair").(string)
 	ui := state.Get("ui").(packer.Ui)
 
@@ -38,11 +38,12 @@ func (s *StepRunSourceServer) Run(state multistep.StateBag) multistep.StepAction
 		networks[i].UUID = networkUuid
 	}
 
+	ui.Say("Launching server...")
 	s.server, err = servers.Create(computeClient, keypairs.CreateOptsExt{
 		CreateOptsBuilder: servers.CreateOpts{
 			Name:           s.Name,
 			ImageRef:       s.SourceImage,
-			FlavorName:     s.Flavor,
+			FlavorRef:      flavor,
 			SecurityGroups: s.SecurityGroups,
 			Networks:       networks,
 		},
@@ -56,9 +57,10 @@ func (s *StepRunSourceServer) Run(state multistep.StateBag) multistep.StepAction
 		return multistep.ActionHalt
 	}
 
+	ui.Message(fmt.Sprintf("Server ID: %s", s.server.ID))
 	log.Printf("server id: %s", s.server.ID)
 
-	ui.Say(fmt.Sprintf("Waiting for server (%s) to become ready...", s.server.ID))
+	ui.Say("Waiting for server to become ready...")
 	stateChange := StateChangeConf{
 		Pending:   []string{"BUILD"},
 		Target:    "ACTIVE",
diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown
index 10f38a445..3b5bf791d 100644
--- a/website/source/docs/builders/openstack.html.markdown
+++ b/website/source/docs/builders/openstack.html.markdown
@@ -29,7 +29,7 @@ each category, the available configuration keys are alphabetized.
 
 ### Required:
 
-* `flavor` (string) - The ID or full URL for the desired flavor for the
+* `flavor` (string) - The ID, name, or full URL for the desired flavor for the
   server to be created.
 
 * `image_name` (string) - The name of the resulting image.