From 8d00ee38366ab99954a5d06fe007d87ce5df744d Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Sat, 27 Feb 2016 04:34:17 +0000 Subject: [PATCH] provider/openstack: Add Support for Domain environment variables This commit adds the ability to specify the Domain ID and Domain Name by OS_DOMAIN_ID and OS_DOMAIN_NAME respectively. --- builtin/providers/openstack/provider.go | 12 ++++++------ .../docs/providers/openstack/index.html.markdown | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go index cb198425e..a6d126ec4 100644 --- a/builtin/providers/openstack/provider.go +++ b/builtin/providers/openstack/provider.go @@ -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, diff --git a/website/source/docs/providers/openstack/index.html.markdown b/website/source/docs/providers/openstack/index.html.markdown index e24857193..52f94e46a 100644 --- a/website/source/docs/providers/openstack/index.html.markdown +++ b/website/source/docs/providers/openstack/index.html.markdown @@ -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)