opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit 'c67e949e68b27e937e532e2ab907d2814aafb805':
  host ping catalog add elasticsearch service
This commit is contained in:
邱剑
2018-11-23 14:56:17 +08:00
parent 2ac1ad0242 c67e949e68
commit 07ec657fa6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+2 -1
View File
@@ -2331,7 +2331,8 @@ func (self *SHost) PerformPing(ctx context.Context, userCred mcclient.TokenCrede
}
result := jsonutils.NewDict()
result.Set("name", jsonutils.NewString(self.GetName()))
catalog := auth.GetCatalogData([]string{"ntpd", "kafka", "influxdb"}, options.Options.Region)
dependSvcs := []string{"ntpd", "kafka", "influxdb", "elasticsearch"}
catalog := auth.GetCatalogData(dependSvcs, options.Options.Region)
if catalog == nil {
return nil, fmt.Errorf("Get catalog error")
}