Merge pull request #768 from devcamcar/openstack-env-support

builder/openstack: Add support for standard OpenStack environment variables

builder/openstack/access_config.go

@@ -2,17 +2,20 @@ package openstack
 
 import (
 	"fmt"
+	"github.com/mitchellh/packer/common"
 	"github.com/mitchellh/packer/packer"
 	"github.com/rackspace/gophercloud"
 	"net/http"
 	"net/url"
 	"os"
+	"strings"
 )
 
 // AccessConfig is for common configuration related to openstack access
 type AccessConfig struct {
 	Username  string `mapstructure:"username"`
 	Password  string `mapstructure:"password"`
+	ApiKey    string `mapstructure:"api_key"`
 	Project   string `mapstructure:"project"`
 	Provider  string `mapstructure:"provider"`
 	RawRegion string `mapstructure:"region"`
@@ -22,39 +25,35 @@ type AccessConfig struct {
 // Auth returns a valid Auth object for access to openstack services, or
 // an error if the authentication couldn't be resolved.
 func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
-	username := c.Username
-	password := c.Password
-	project := c.Project
-	provider := c.Provider
-	proxy := c.ProxyUrl
-
-	if username == "" {
-		username = os.Getenv("SDK_USERNAME")
-	}
-	if password == "" {
-		password = os.Getenv("SDK_PASSWORD")
-	}
-	if project == "" {
-		project = os.Getenv("SDK_PROJECT")
-	}
-	if provider == "" {
-		provider = os.Getenv("SDK_PROVIDER")
+	c.Username = common.CoalesceVals(c.Username, os.Getenv("SDK_USERNAME"), os.Getenv("OS_USERNAME"))
+	c.Password = common.CoalesceVals(c.Password, os.Getenv("SDK_PASSWORD"), os.Getenv("OS_PASSWORD"))
+	c.ApiKey = common.CoalesceVals(c.ApiKey, os.Getenv("SDK_API_KEY"))
+	c.Project = common.CoalesceVals(c.Project, os.Getenv("SDK_PROJECT"), os.Getenv("OS_TENANT_NAME"))
+	c.Provider = common.CoalesceVals(c.Provider, os.Getenv("SDK_PROVIDER"), os.Getenv("OS_AUTH_URL"))
+	c.RawRegion = common.CoalesceVals(c.RawRegion, os.Getenv("SDK_REGION"), os.Getenv("OS_REGION_NAME"))
+
+	// OpenStack's auto-generated openrc.sh files do not append the suffix
+	// /tokens to the authentication URL. This ensures it is present when
+	// specifying the URL.
+	if strings.Contains(c.Provider, "://") && !strings.HasSuffix(c.Provider, "/tokens") {
+		c.Provider += "/tokens"
 	}
 
 	authoptions := gophercloud.AuthOptions{
-		Username:    username,
-		Password:    password,
+		Username:    c.Username,
+		Password:    c.Password,
+		ApiKey:      c.ApiKey,
 		AllowReauth: true,
 	}
 
-	if project != "" {
-		authoptions.TenantName = project
+	if c.Project != "" {
+		authoptions.TenantName = c.Project
 	}
 
 	// For corporate networks it may be the case where we want our API calls
 	// to be sent through a separate HTTP proxy than external traffic.
-	if proxy != "" {
-		url, err := url.Parse(proxy)
+	if c.ProxyUrl != "" {
+		url, err := url.Parse(c.ProxyUrl)
 		if err != nil {
 			return nil, err
 		}
@@ -64,11 +63,11 @@ func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
 		http.DefaultTransport = &http.Transport{Proxy: http.ProxyURL(url)}
 	}
 
-	return gophercloud.Authenticate(provider, authoptions)
+	return gophercloud.Authenticate(c.Provider, authoptions)
 }
 
 func (c *AccessConfig) Region() string {
-	return c.RawRegion
+	return common.CoalesceVals(c.RawRegion, os.Getenv("SDK_REGION"), os.Getenv("OS_REGION_NAME"))
 }
 
 func (c *AccessConfig) Prepare(t *packer.ConfigTemplate) []error {
@@ -83,6 +82,7 @@ func (c *AccessConfig) Prepare(t *packer.ConfigTemplate) []error {
 	templates := map[string]*string{
 		"username": &c.Username,
 		"password": &c.Password,
+		"apiKey":   &c.ApiKey,
 		"provider": &c.Provider,
 	}
 
@@ -96,7 +96,7 @@ func (c *AccessConfig) Prepare(t *packer.ConfigTemplate) []error {
 		}
 	}
 
-	if c.RawRegion == "" {
+	if c.Region() == "" {
 		errs = append(errs, fmt.Errorf("region must be specified"))
 	}
 

common/config.go

@@ -194,3 +194,12 @@ func decodeConfigHook(raws []interface{}) (mapstructure.DecodeHookFunc, error) {
 		return v, nil
 	}, nil
 }
+
+func CoalesceVals(vals ...string) string {
+    for _, el := range vals {
+        if el != "" {
+            return el
+        }
+    }
+    return ""
+}