ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6081 from jtopjian/openstack-token-auth 

provider/openstack: Enable Token Authentication
This commit is contained in:
Joe Topjian 2016-04-16 22:57:01 -06:00
parent f39828fd97 a8a3bd71df
commit db3e731cf3
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/openstack/config.go
View File

@ -15,6 +15,7 @@ type Config struct {
Username string
UserID string
Password string
Token string
APIKey string
IdentityEndpoint string
TenantID string
@ -41,6 +42,7 @@ func (c *Config) loadAndValidate() error {
Username: c.Username,
UserID: c.UserID,
Password: c.Password,
TokenID: c.Token,
APIKey: c.APIKey,
IdentityEndpoint: c.IdentityEndpoint,
TenantID: c.TenantID,

12
builtin/providers/openstack/provider.go
View File

@ -17,7 +17,7 @@ func Provider() terraform.ResourceProvider {
"user_name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_USERNAME", nil),
DefaultFunc: schema.EnvDefaultFunc("OS_USERNAME", ""),
},
"user_id": &schema.Schema{
Type: schema.TypeString,
@ -37,12 +37,17 @@ func Provider() terraform.ResourceProvider {
"password": &schema.Schema{
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_PASSWORD", nil),
DefaultFunc: schema.EnvDefaultFunc("OS_PASSWORD", ""),
},
"token": &schema.Schema{
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_AUTH_TOKEN", ""),
},
"api_key": &schema.Schema{
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_AUTH_TOKEN", ""),
DefaultFunc: schema.EnvDefaultFunc("OS_API_KEY", ""),
},
"domain_id": &schema.Schema{
Type: schema.TypeString,
@ -104,6 +109,7 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
Username: d.Get("user_name").(string),
UserID: d.Get("user_id").(string),
Password: d.Get("password").(string),
Token: d.Get("token").(string),
APIKey: d.Get("api_key").(string),
TenantID: d.Get("tenant_id").(string),
TenantName: d.Get("tenant_name").(string),

13
website/source/docs/providers/openstack/index.html.markdown
View File

@ -46,7 +46,18 @@ The following arguments are supported:
* `password` - (Optional; Required if not using `api_key`) If omitted, the
`OS_PASSWORD` environment variable is used.
* `api_key` - (Optional; Required if not using `password`)
* `token` - (Optional; Required if not using `user_name` and `password`)
A token is an expiring, temporary means of access issued via the
Keystone service. By specifying a token, you do not have to
specify a username/password combination, since the token was
already created by a username/password out of band of Terraform.
If ommitted, the `OS_AUTH_TOKEN` environment variable is used.
* `api_key` - (Optional; Required if not using `password`) An API Key
is issued by a cloud provider as alternative password. Unless
your cloud provider has documentation referencing an API Key,
you can safely ignore this argument. If omitted, the `OS_API_KEY`
environment variable is used.
* `domain_id` - (Optional) If omitted, the `OS_DOMAIN_ID` environment
variable is used.