From 9b54c569cc2b20f0eb5a6a3c0f268d5ff2f6aa68 Mon Sep 17 00:00:00 2001
From: Jon Perritt <jrperritt@gmail.com>
Date: Mon, 26 Jan 2015 11:38:02 -0700
Subject: [PATCH] use 'Default' to forgo prompt

---
 builtin/providers/openstack/provider.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go
index 27a6321fa4..53f63f5d70 100644
--- a/builtin/providers/openstack/provider.go
+++ b/builtin/providers/openstack/provider.go
@@ -24,17 +24,17 @@ func Provider() terraform.ResourceProvider {
 			"user_id": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_USERID"),
+				Default: "",
 			},
 			"tenant_id": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_TENANT_ID"),
+				Default: "",
 			},
 			"tenant_name": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_TENANT_NAME"),
+				Default: "",
 			},
 			"password": &schema.Schema{
 				Type:        schema.TypeString,
@@ -44,17 +44,17 @@ func Provider() terraform.ResourceProvider {
 			"api_key": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_API_KEY"),
+				Default: "",
 			},
 			"domain_id": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_DOMAIN_ID"),
+				Default: "",
 			},
 			"domain_name": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: envDefaultFunc("OS_DOMAIN_NAME"),
+				Default: "",
 			},
 		},