opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix baremetal register get service url

Browse Source
This commit is contained in:
wanyaoqi
2019-12-12 17:35:36 +08:00
parent 24b518a3b7
commit f0cb9c15d3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/hosts.go
+1 -1
View File
@@ -824,7 +824,7 @@ func (self *SHostManager) AllowGetPropertyBmStartRegisterScript(ctx context.Cont
}
func (self *SHostManager) GetPropertyBmStartRegisterScript(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (jsonutils.JSONObject, error) {
regionUri, err := auth.GetServiceURL("compute_v2", options.Options.Region, "", "")
regionUri, err := auth.GetPublicServiceURL("compute_v2", options.Options.Region, "")
if err != nil {
return nil, err
}
pkg/mcclient/auth/auth.go
+4
View File
@@ -261,6 +261,10 @@ func GetServiceURL(service, region, zone, endpointType string) (string, error) {
return manager.GetServiceURL(service, region, zone, endpointType)
}
func GetPublicServiceURL(service, region, zone string) (string, error) {
return manager.GetServiceURL(service, region, zone, PublicEndpointType)
}
func GetServiceURLs(service, region, zone, endpointType string) ([]string, error) {
return manager.GetServiceURLs(service, region, zone, endpointType)
}