From 737d5ae68dddffe3b6713c2d80cb41d0454e5a37 Mon Sep 17 00:00:00 2001
From: zengchen1024 <chenzeng2@huawei.com>
Date: Tue, 8 Jan 2019 18:09:42 +0800
Subject: [PATCH] fix set an empty value for header of X-Project-Id

---
 openstack/client.go | 4 ++++
 provider_client.go  | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/openstack/client.go b/openstack/client.go
index 26134ba98..acd798692 100644
--- a/openstack/client.go
+++ b/openstack/client.go
@@ -308,7 +308,11 @@ func v3AKSKAuth(client *golangsdk.ProviderClient, endpoint string, options golan
 		v3Client.Endpoint = endpoint
 	}
 
+	defer func() {
+		v3Client.AKSKAuthOptions.ProjectId = options.ProjectId
+	}()
 	v3Client.AKSKAuthOptions = options
+	v3Client.AKSKAuthOptions.ProjectId = ""
 
 	if options.ProjectId == "" && options.ProjectName != "" {
 		id, err := getProjectID(v3Client, options.ProjectName)
diff --git a/provider_client.go b/provider_client.go
index efa0b0bb6..474b77017 100644
--- a/provider_client.go
+++ b/provider_client.go
@@ -234,7 +234,9 @@ func (client *ProviderClient) Request(method, url string, options *RequestOpts)
 			AccessKey: client.AKSKAuthOptions.AccessKey,
 			SecretKey: client.AKSKAuthOptions.SecretKey,
 		})
-		req.Header.Set("X-Project-Id", client.AKSKAuthOptions.ProjectId)
+		if client.AKSKAuthOptions.ProjectId != "" {
+			req.Header.Set("X-Project-Id", client.AKSKAuthOptions.ProjectId)
+		}
 	}
 
 	// Issue the request.