From 72f721bc0c8b702872dd950a56598cfa07ded58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <qu_xuan@icloud.com>
Date: Wed, 3 Apr 2019 17:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BC=BA=E5=A4=B1=E7=9A=84al?=
 =?UTF-8?q?lowempty=20tag=20(#201)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 补充缺失的allowempty tag

* 添加一个可以忽略的错误
---
 pkg/util/azure/azure.go    | 3 ++-
 pkg/util/azure/instance.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/util/azure/azure.go b/pkg/util/azure/azure.go
index 45170f13f6..c8c5373527 100644
--- a/pkg/util/azure/azure.go
+++ b/pkg/util/azure/azure.go
@@ -597,7 +597,8 @@ func waitForComplatetion(client *autorest.Client, req *http.Request, resp *http.
 						}
 						switch azureError.Code {
 						// 忽略创建机器时初始化超时问题
-						case "OSProvisioningTimedOut", "OSProvisioningClientError":
+						case "OSProvisioningTimedOut", "OSProvisioningClientError", "OSProvisioningInternalError":
+							// {"code":"OSProvisioningInternalError","message":"OS Provisioning failed for VM 'stress-testvm-azure-1' due to an internal error: [000004] cloud-init appears to be running, this is not expected, cannot continue."}
 							log.Debugf("ignore OSProvisioning error: %s", azureError)
 							return nil, nil
 						default:
diff --git a/pkg/util/azure/instance.go b/pkg/util/azure/instance.go
index a870c8ee0d..7e9649fdfc 100644
--- a/pkg/util/azure/instance.go
+++ b/pkg/util/azure/instance.go
@@ -81,7 +81,7 @@ type DataDisk struct {
 type StorageProfile struct {
 	ImageReference ImageReference `json:"imageReference,omitempty"`
 	OsDisk         OSDisk         `json:"osDisk,omitempty"`
-	DataDisks      []DataDisk     `json:"dataDisks"`
+	DataDisks      []DataDisk     `json:"dataDisks,allowempty"`
 }
 
 type SSHPublicKey struct {