Merge pull request #2234 from trumant/os_auth_token

Fixes #2212 by allowing OS_AUTH_TOKEN to set api_key config value
hashicorp · Jun 5, 2015 · 834fda7 · 834fda7
2 parents 4ce65e5 + 7fe29ef
commit 834fda7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go
@@ -44,7 +44,7 @@ func Provider() terraform.ResourceProvider {
  "api_key": &schema.Schema{
  Type: schema.TypeString,
  Optional: true,
- Default: "",
+ DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"),
  },
  "domain_id": &schema.Schema{
  Type: schema.TypeString,