From e36c3e5946bbef3390f432cc17fbd5af10425c57 Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Thu, 29 Sep 2016 13:52:53 +0000
Subject: [PATCH] provider/openstack: gophercloud migration: Continued removal
 of APIKey

---
 builtin/providers/openstack/config.go   | 1 -
 builtin/providers/openstack/provider.go | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/builtin/providers/openstack/config.go b/builtin/providers/openstack/config.go
index 0df6b7598..e4c6913fa 100644
--- a/builtin/providers/openstack/config.go
+++ b/builtin/providers/openstack/config.go
@@ -16,7 +16,6 @@ type Config struct {
 	UserID           string
 	Password         string
 	Token            string
-	APIKey           string
 	IdentityEndpoint string
 	TenantID         string
 	TenantName       string
diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go
index 9116ec994..0211d4756 100644
--- a/builtin/providers/openstack/provider.go
+++ b/builtin/providers/openstack/provider.go
@@ -48,11 +48,6 @@ func Provider() terraform.ResourceProvider {
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("OS_AUTH_TOKEN", ""),
 			},
-			"api_key": &schema.Schema{
-				Type:        schema.TypeString,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("OS_API_KEY", ""),
-			},
 			"domain_id": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -133,7 +128,6 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
 		UserID:           d.Get("user_id").(string),
 		Password:         d.Get("password").(string),
 		Token:            d.Get("token").(string),
-		APIKey:           d.Get("api_key").(string),
 		TenantID:         d.Get("tenant_id").(string),
 		TenantName:       d.Get("tenant_name").(string),
 		DomainID:         d.Get("domain_id").(string),