Commit 43cb57cd authored by Justin Santa Barbara's avatar Justin Santa Barbara

Allow the Openstack project to be specified

It isn't actually optional, according to the spec
parent bde4fbf7
...@@ -11,6 +11,7 @@ import ( ...@@ -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 { ...@@ -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) { ...@@ -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")
} }
...@@ -35,6 +40,7 @@ func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) { ...@@ -35,6 +40,7 @@ func (c *AccessConfig) Auth() (gophercloud.AccessProvider, error) {
authoptions := gophercloud.AuthOptions{ authoptions := gophercloud.AuthOptions{
Username: username, Username: username,
Password: password, Password: password,
TenantName: project,
AllowReauth: true, AllowReauth: true,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment