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(region): openstack compute api version

Browse Source
This commit is contained in:
ioito
2023-03-02 10:59:43 +08:00
parent 7df80a5e60
commit cb2731f493
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,7 @@ require (
k8s.io/client-go v0.19.3
k8s.io/cluster-bootstrap v0.19.3
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230301101220-ebd68c96818a
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1164,8 +1164,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45 h1:O45uaLmag5nrQoO0sn8nkrLvG4yp+im/1QizinLnLM0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230301101220-ebd68c96818a h1:gSfHCwI/E6VXEkofCj8Fw3J5Byc8Pf9Ubt6ijtNPONk=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230301101220-ebd68c96818a/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
pkg/compute/models/guest_actions.go
+3
View File
@@ -77,6 +77,9 @@ func (self *SGuest) GetDetailsVnc(ctx context.Context, userCred mcclient.TokenCr
if err != nil {
return nil, httperrors.NewInternalServerError(errors.Wrapf(err, "GetHost").Error())
}
if options.Options.ForceUseOriginVnc {
input.Origin = true
}
ret, err = self.GetDriver().GetGuestVncInfo(ctx, userCred, self, host, input)
if err != nil {
return nil, err
pkg/compute/options/options.go
+1
View File
@@ -198,6 +198,7 @@ type ComputeOptions struct {
KvmMonitorAgentUseMetadataService bool `help:"Monitor agent report metrics to metadata service on host" default:"true"`
MonitorEndpointType string `help:"specify monitor endpoint type" default:"public"`
ForceUseOriginVnc bool `help:"force openstack use origin vnc console" default:"true"`
esxi.EsxiOptions
}
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1442,7 +1442,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230301101220-ebd68c96818a
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/openstack.go
Generated Vendored
+5 -2
View File
@@ -27,7 +27,6 @@ import (
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/httputils"
"yunion.io/x/pkg/util/version"
"yunion.io/x/pkg/utils"
api "yunion.io/x/cloudmux/pkg/apis/compute"
"yunion.io/x/cloudmux/pkg/cloudprovider"
@@ -251,7 +250,11 @@ func (cli *SOpenStackClient) jsonReuest(token oscli.TokenCredential, service, re
header := http.Header{}
header.Set("X-Auth-Token", token.GetTokenString())
apiVersion := ""
if !utils.IsInStringArray(service, []string{OPENSTACK_SERVICE_IMAGE, OPENSTACK_SERVICE_IDENTITY}) {
switch service {
case OPENSTACK_SERVICE_IMAGE, OPENSTACK_SERVICE_IDENTITY:
case OPENSTACK_SERVICE_COMPUTE:
apiVersion = "2.1"
default:
apiVersion, err = cli.getApiVerion(token, serviceUrl, debug)
if err != nil {
log.Errorf("get service %s api version error: %v", service, err)