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

Merge pull request #729 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-make-host-resource-type-optional to release/2.4.0

Browse Source 
* commit 'a5dfe342a1462a2dcb9d108ba53cf5fb62a9ab4e':
  将host resource type设置为create_optional，且default为shared
This commit is contained in:
邱剑
2018-12-12 13:15:21 +08:00
parent ce3d1368c2 a5dfe342a1
commit 0be138c10e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/appsrv/handlerinfo.go
+1 -1
View File
@@ -110,4 +110,4 @@ func (hi *SHandlerInfo) GetAppParams(params map[string]string, path []string) *S
appParams.Params = params
appParams.Path = path
return &appParams
}
}
pkg/compute/models/hosts.go
+2 -2
View File
@@ -23,6 +23,7 @@ import (
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudcommon/db/taskman"
@@ -35,7 +36,6 @@ import (
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/util/httputils"
"yunion.io/x/onecloud/pkg/util/logclient"
"yunion.io/x/onecloud/pkg/appsrv"
)
const (
@@ -166,7 +166,7 @@ type SHost struct {
LastPingAt time.Time ``
ResourceType string `width:"36" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_required"` // Column(VARCHAR(36, charset='ascii'), nullable=False)
ResourceType string `width:"36" charset:"ascii" nullable:"false" list:"admin" update:"admin" create:"admin_optional" default:"shared"` // Column(VARCHAR(36, charset='ascii'), nullable=False)
RealExternalId string `width:"256" charset:"utf8" get:"admin"`
}