From 6433953d9fefa539e98ee323f905075187fc9d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Thu, 11 Oct 2018 17:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=9B=A0publickey=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E9=87=8D=E8=A3=85=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/util/azure/instance.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg/util/azure/instance.go b/pkg/util/azure/instance.go
index d69b798203..fccae31651 100644
--- a/pkg/util/azure/instance.go
+++ b/pkg/util/azure/instance.go
@@ -583,16 +583,15 @@ func (region *SRegion) ReplaceSystemDisk(instanceId, imageId, passwd, publicKey
 						},
 					},
 					OsProfile: &compute.OSProfile{
-						AdminUsername: &instance.Properties.OsProfile.AdminUsername,
-						AdminPassword: &passwd,
-						LinuxConfiguration: &compute.LinuxConfiguration{
-							SSH: &compute.SSHConfiguration{
-								PublicKeys: &sshKeys,
-							},
-						},
+						AdminUsername:      &instance.Properties.OsProfile.AdminUsername,
+						AdminPassword:      &passwd,
+						LinuxConfiguration: &compute.LinuxConfiguration{},
 					},
 				},
 			}
+			if len(publicKey) > 0 {
+				params.OsProfile.LinuxConfiguration.SSH = &compute.SSHConfiguration{PublicKeys: &sshKeys}
+			}
 			if err := region.UpdateInstance(instanceId, params); err != nil {
 				region.deleteDisk(diskId)
 				return "", err