Merge pull request #1313 in YUNIONIO/onecloud from ~LIZEXI/onecloud:hotfix/lzx-resolve-conflict-2.8.0-2019032201 to release/2.8.0

* commit '7707985a8c4c375511789a18037b1256c353c38e':
  避免default secgroup不能重设
  修正: schedpolicies 加入的标签没有传入 params,导致动态标签不生效
  fix deploy file
  webconsole: append protocol params for each connParams
This commit is contained in:
邱剑
2019-03-22 16:30:23 +08:00
+1 -1
View File
@@ -805,7 +805,7 @@ func (self *SGuest) AllowPerformRevokeSecgroup(ctx context.Context, userCred mcc
func (self *SGuest) saveDefaultSecgroupId(userCred mcclient.TokenCredential, secGrpId string) error {
if secGrpId != self.SecgrpId {
diff, err := db.Update(self, func() error {
self.SecgrpId = "default"
self.SecgrpId = secGrpId
return nil
})
if err != nil {