fix host init without etcd

yunionio · Apr 30, 2020 · 9652c97 · 9652c97
1 parent db2d02f
commit 9652c97
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pkg/apis/compute/host.go b/pkg/apis/compute/host.go
@@ -164,7 +164,7 @@ type HostDetails struct {
 	CanPrepare        bool                `json:"can_prepare"`
 	PrepareFailReason string              `json:"prepare_fail_reason"`
 	// 允许开启宿主机健康检查
-	EnableHealthCheck bool `json:"enable_health_check"`
+	AllowHealthCheck bool `json:"allow_health_check"`
 
 	// 标签
 	Metadata map[string]string `json:"metadata"`

diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go
@@ -2607,7 +2607,7 @@ func (self *SHost) getMoreDetails(ctx context.Context, out api.HostDetails, show
 	}
 
 	if self.EnableHealthCheck && hostHealthChecker != nil {
-		out.EnableHealthCheck = true
+		out.AllowHealthCheck = true
 	}
 	return out
 }

diff --git a/pkg/hostman/host_services.go b/pkg/hostman/host_services.go
@@ -141,6 +141,9 @@ func (host *SHostService) initEtcdConfig() error {
 	if err != nil {
 		return errors.Wrap(err, "fetch etcd service info")
 	}
+	if etcdEndpoint == nil {
+		return nil
+	}
 	if len(options.HostOptions.EtcdEndpoints) == 0 {
 		options.HostOptions.EtcdEndpoints = []string{etcdEndpoint.Url}
 		if len(etcdEndpoint.CertId) > 0 {