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: use globalEndpointType as default endpoint type

Browse Source
This commit is contained in:
Qiu Jian
2020-02-25 20:47:15 +08:00
parent 1b5756fe1c
commit b395dc8cee
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/service/influxdb.go
+1 -1
View File
@@ -23,7 +23,7 @@ import (
)
func setInfluxdbRetentionPolicy() error {
urls, err := auth.GetServiceURLs("influxdb", options.Options.Region, "", "internal")
urls, err := auth.GetServiceURLs("influxdb", options.Options.Region, "", "")
if err != nil {
return err
}
pkg/hostman/storageman/imagecache_local.go
+1 -1
View File
@@ -174,7 +174,7 @@ func (l *SLocalImageCache) prepare(ctx context.Context, zone, srcUrl, format str
l.consumerCount++
return true, true
}
url, err := auth.GetServiceURL("image", "", zone, "public")
url, err := auth.GetServiceURL("image", "", zone, "")
if err != nil {
log.Errorf("Failed to acquire image %s", err)
return false, true
pkg/mcclient/auth/auth.go
+6
View File
@@ -210,10 +210,16 @@ func (a *authManager) reAuth() {
}
func (a *authManager) GetServiceURL(service, region, zone, endpointType string) (string, error) {
if endpointType == "" && globalEndpointType != "" {
endpointType = globalEndpointType
}
return a.adminCredential.GetServiceURL(service, region, zone, endpointType)
}
func (a *authManager) GetServiceURLs(service, region, zone, endpointType string) ([]string, error) {
if endpointType == "" && globalEndpointType != "" {
endpointType = globalEndpointType
}
return a.adminCredential.GetServiceURLs(service, region, zone, endpointType)
}