fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: host支持标签

Browse Source
This commit is contained in:
Qu Xuan
2019-12-23 19:43:08 +08:00
parent b113ab24ab
commit e089287970
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/compute/api.go
View File

@@ -162,7 +162,7 @@ type ServerCreateInput struct {
VmemSize int `json:"vmem_size"`
VcpuCount int `json:"vcpu_count"`
UserData string `json:"user_data"`
Metadata map[string]string `json:"metadata"`
Metadata map[string]string `json:"__meta__"`
KeypairId string `json:"keypair_id"`
Password string `json:"password"`

1
pkg/cloudcommon/db/metadata.go
View File

@@ -80,6 +80,7 @@ func init() {
"eip": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "elasticips_tbl", "eip", "eips")},
"snapshot": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "snapshots_tbl", "snpashot", "snpashots")},
"dbinstance": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "dbinstances_tbl", "dbinstance", "dbinstances")},
"host": {SStatusStandaloneResourceBaseManager: NewStatusStandaloneResourceBaseManager(SVirtualResourceBase{}, "hosts_tbl", "host", "hosts")},
}
}

5
pkg/compute/models/guests.go
View File

@@ -1520,11 +1520,6 @@ func (guest *SGuest) PostCreate(ctx context.Context, userCred mcclient.TokenCred
gs.GuestId = guest.Id
GuestsecgroupManager.TableSpec().Insert(&gs)
}
if data.Contains("metadata") {
metadata := map[string]interface{}{}
data.Unmarshal(&metadata, "metadata")
guest.SetAllMetadata(ctx, metadata, userCred)
}
}
func (guest *SGuest) setApptags(ctx context.Context, appTags []string, userCred mcclient.TokenCredential) {