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

Merge pull request #5355 from jtopjian/openstack-domain-env-vars 

provider/openstack: Add Support for Domain environment variables
This commit is contained in:
Joe Topjian 2016-02-26 21:42:05 -07:00
parent c3e2c50207 8d00ee3836
commit cb9099e28a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,14 +47,14 @@ func Provider() terraform.ResourceProvider {
DefaultFunc: envDefaultFuncAllowMissing("OS_AUTH_TOKEN"),
},
"domain_id": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Default: "",
Type: schema.TypeString,
Optional: true,
DefaultFunc: envDefaultFuncAllowMissing("OS_DOMAIN_ID"),
},
"domain_name": &schema.Schema{
Type: schema.TypeString,
Optional: true,
Default: "",
Type: schema.TypeString,
Optional: true,
DefaultFunc: envDefaultFuncAllowMissing("OS_DOMAIN_NAME"),
},
"insecure": &schema.Schema{
Type: schema.TypeBool,

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

@ -48,9 +48,11 @@ The following arguments are supported:
* `api_key` - (Optional; Required if not using `password`)
* `domain_id` - (Optional)
* `domain_id` - (Optional) If omitted, the `OS_DOMAIN_ID` environment
variable is used.
* `domain_name` - (Optional)
* `domain_name` - (Optional) If omitted, the `OS_DOMAIN_NAME`
environment variable is used.
* `tenant_id` - (Optional)