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

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

provider/openstack: Allow empty api_key and endpoint_type
This commit is contained in:
Paul Hinze 2015-07-09 10:55:56 -06:00
parent aacfb4276d 5251193f87
commit 4c1c67b520
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ func Provider() terraform.ResourceProvider {
"api_key": &schema.Schema{ "api_key": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
DefaultFunc: envDefaultFunc("OS_AUTH_TOKEN"), DefaultFunc: envDefaultFuncAllowMissing("OS_AUTH_TOKEN"),
}, },
"domain_id": &schema.Schema{ "domain_id": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
@ -64,7 +64,7 @@ func Provider() terraform.ResourceProvider {
"endpoint_type": &schema.Schema{ "endpoint_type": &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
DefaultFunc: envDefaultFunc("OS_ENDPOINT_TYPE"), DefaultFunc: envDefaultFuncAllowMissing("OS_ENDPOINT_TYPE"),
}, },
}, },