From e813eb5bb242fa4f56dc73d4ebd2899a1135a233 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Fri, 2 Aug 2019 03:50:49 +0000
Subject: [PATCH] =?UTF-8?q?ansibleserver:=20=E6=93=8D=E4=BD=9C=E5=AE=BF?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E6=97=B6=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/ansibleserver/models/ansibleplaybooks_validator.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/ansibleserver/models/ansibleplaybooks_validator.go b/pkg/ansibleserver/models/ansibleplaybooks_validator.go
index ccd131f988..61924871f0 100644
--- a/pkg/ansibleserver/models/ansibleplaybooks_validator.go
+++ b/pkg/ansibleserver/models/ansibleplaybooks_validator.go
@@ -58,6 +58,7 @@ func (v *ValidatorAnsiblePlaybook) Validate(data *jsonutils.JSONDict) error {
 		if len(name) == 0 {
 			return httperrors.NewBadRequestError("empty host name")
 		}
+		defaultUsername := ansible.PUBLIC_CLOUD_ANSIBLE_USER
 		switch {
 		case regutils.MatchIP4Addr(name):
 		case strings.HasPrefix(name, "host:"):
@@ -67,6 +68,7 @@ func (v *ValidatorAnsiblePlaybook) Validate(data *jsonutils.JSONDict) error {
 			if err != nil {
 				return err
 			}
+			defaultUsername = "root"
 		case strings.HasPrefix(name, "server:"):
 			name = name[len("server:"):]
 			fallthrough
@@ -80,7 +82,9 @@ func (v *ValidatorAnsiblePlaybook) Validate(data *jsonutils.JSONDict) error {
 		}
 		hosts[i].Name = name
 		if username, _ := hosts[i].GetVar("ansible_user"); username == "" {
-			hosts[i].SetVar("ansible_user", ansible.PUBLIC_CLOUD_ANSIBLE_USER)
+			if defaultUsername != "" {
+				hosts[i].SetVar("ansible_user", defaultUsername)
+			}
 		}
 	}
 	v.Playbook = pb