Merge pull request #2626 from jtopjian/openstack-allow-empty-apikey-endpointtype

provider/openstack: Allow empty api_key and endpoint_type
11 years ago · 4c1c67b520
parent aacfb4276d 5251193f87
commit 4c1c67b520
1 changed files with 2 additions and 2 deletions
--- 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,
-				DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"),
+				DefaultFunc: envDefaultFuncAllowMissing("OS_AUTH_TOKEN"),
 			},
 			"domain_id": &schema.Schema{
 				Type:     schema.TypeString,
@ -64,7 +64,7 @@ func Provider() terraform.ResourceProvider {
 			"endpoint_type": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_ENDPOINT_TYPE"),
+				DefaultFunc: envDefaultFuncAllowMissing("OS_ENDPOINT_TYPE"),
 			},
 		},