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

provider/openstack: gophercloud migration: Continued removal of APIKey

This commit is contained in:
Joe Topjian 2016-09-29 13:52:53 +00:00
parent d4722aedc1
commit e36c3e5946
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ type Config struct {
UserID string UserID string
Password string Password string
Token string Token string
APIKey string
IdentityEndpoint string IdentityEndpoint string
TenantID string TenantID string
TenantName string TenantName string

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

@ -48,11 +48,6 @@ func Provider() terraform.ResourceProvider {
Optional: true, Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_AUTH_TOKEN", ""), DefaultFunc: schema.EnvDefaultFunc("OS_AUTH_TOKEN", ""),
}, },
"api_key": &schema.Schema{
Type: schema.TypeString,
Optional: true,
DefaultFunc: schema.EnvDefaultFunc("OS_API_KEY", ""),
},
"domain_id": &schema.Schema{ "domain_id": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
@ -133,7 +128,6 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
UserID: d.Get("user_id").(string), UserID: d.Get("user_id").(string),
Password: d.Get("password").(string), Password: d.Get("password").(string),
Token: d.Get("token").(string), Token: d.Get("token").(string),
APIKey: d.Get("api_key").(string),
TenantID: d.Get("tenant_id").(string), TenantID: d.Get("tenant_id").(string),
TenantName: d.Get("tenant_name").(string), TenantName: d.Get("tenant_name").(string),
DomainID: d.Get("domain_id").(string), DomainID: d.Get("domain_id").(string),