From cbb2b538bd3c5502bc287925f37e8b311c5ab2f4 Mon Sep 17 00:00:00 2001
From: Toni Ylenius <toni.ylenius@cybercom.com>
Date: Mon, 10 Aug 2015 16:35:56 +0300
Subject: [PATCH] Support source_image_name in OpenStack builder

As gophercloud supports source_image_name let's allow that in builder
configuration also. This an alternative way of providing source_image.
---
 builder/openstack/builder.go                         | 1 +
 builder/openstack/run_config.go                      | 7 +++++--
 builder/openstack/step_run_source_server.go          | 2 ++
 website/source/docs/builders/openstack.html.markdown | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index 9f4c9e7bc..db8e80e55 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -83,6 +83,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepRunSourceServer{
 			Name:             b.config.ImageName,
 			SourceImage:      b.config.SourceImage,
+			SourceImageName:  b.config.SourceImageName,
 			SecurityGroups:   b.config.SecurityGroups,
 			Networks:         b.config.Networks,
 			AvailabilityZone: b.config.AvailabilityZone,
diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index a8b8638dc..68a01b6c4 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -15,6 +15,7 @@ type RunConfig struct {
 	SSHInterface   string              `mapstructure:"ssh_interface"`
 
 	SourceImage      string   `mapstructure:"source_image"`
+	SourceImageName  string   `mapstructure:"source_image_name"`
 	Flavor           string   `mapstructure:"flavor"`
 	AvailabilityZone string   `mapstructure:"availability_zone"`
 	RackconnectWait  bool     `mapstructure:"rackconnect_wait"`
@@ -42,8 +43,10 @@ func (c *RunConfig) Prepare(ctx *interpolate.Context) []error {
 
 	// Validation
 	errs := c.Comm.Prepare(ctx)
-	if c.SourceImage == "" {
-		errs = append(errs, errors.New("A source_image must be specified"))
+	if c.SourceImage == "" && c.SourceImageName == "" {
+		errs = append(errs, errors.New("Either a source_image or a source_image_name must be specified"))
+	} else if len(c.SourceImage) > 0 && len(c.SourceImageName) > 0 {
+		errs = append(errs, errors.New("Only a source_image or a source_image_name can be specified, not both."))
 	}
 
 	if c.Flavor == "" {
diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go
index f78fe4f90..d8b2cd00c 100644
--- a/builder/openstack/step_run_source_server.go
+++ b/builder/openstack/step_run_source_server.go
@@ -14,6 +14,7 @@ import (
 type StepRunSourceServer struct {
 	Name             string
 	SourceImage      string
+	SourceImageName  string
 	SecurityGroups   []string
 	Networks         []string
 	AvailabilityZone string
@@ -57,6 +58,7 @@ func (s *StepRunSourceServer) Run(state multistep.StateBag) multistep.StepAction
 		CreateOptsBuilder: servers.CreateOpts{
 			Name:             s.Name,
 			ImageRef:         s.SourceImage,
+			ImageName:        s.SourceImageName,
 			FlavorRef:        flavor,
 			SecurityGroups:   s.SecurityGroups,
 			Networks:         networks,
diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown
index 12a1ca882..e6b6d4760 100644
--- a/website/source/docs/builders/openstack.html.markdown
+++ b/website/source/docs/builders/openstack.html.markdown
@@ -48,6 +48,10 @@ builder.
     Unless you specify completely custom SSH settings, the source image must
     have `cloud-init` installed so that the keypair gets assigned properly.
 
+-   `source_image_name` (string) - The name of the base image to use. This
+    is an alternative way of providig `source_image` and only either of them
+    can be specified.
+
 -   `username` (string) - The username used to connect to the OpenStack service.
     If not specified, Packer will use the environment variable `OS_USERNAME`,
     if set.