iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #382 from justinsb/specify_openstack_project 

builder/openstack: allow project to be specified
This commit is contained in:
Mitchell Hashimoto 2013-09-02 17:33:57 -07:00
parent 8e9428633b 7a628b294d
commit c4ca558174
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builder/openstack/access_config.go
View File

@ -11,6 +11,7 @@ import (
type AccessConfig struct { type AccessConfig struct {
Username string `mapstructure:"username"` Username string `mapstructure:"username"`
Password string `mapstructure:"password"` Password string `mapstructure:"password"`
Project string `mapstructure:"project"`
Provider string `mapstructure:"provider"` Provider string `mapstructure:"provider"`
RawRegion string `mapstructure:"region"` RawRegion string `mapstructure:"region"`
} }
@ -20,6 +21,7 @@ type AccessConfig struct {
func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) { func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
username := c.Username username := c.Username
password := c.Password password := c.Password
project := c.Project
provider := c.Provider provider := c.Provider
if username == "" { if username == "" {
@ -28,6 +30,9 @@ func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
if password == "" { if password == "" {
password = os.Getenv("SDK_PASSWORD") password = os.Getenv("SDK_PASSWORD")
} }
if project == "" {
project = os.Getenv("SDK_PROJECT")
}
if provider == "" { if provider == "" {
provider = os.Getenv("SDK_PROVIDER") provider = os.Getenv("SDK_PROVIDER")
} }
@ -38,6 +43,10 @@ func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
AllowReauth: true, AllowReauth: true,
} }
if project != "" {
authoptions.TenantName = project
}
return gophercloud.Authenticate(provider, authoptions) return gophercloud.Authenticate(provider, authoptions)
} }