opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.1.0 -> release/2.2.0

Browse Source 
* commit '4e7702f0ae7a0ca5f70cf408d3129da76300ac61':
  避免私有云安全组规则下发不完成,ruleset后面补充
This commit is contained in:
邱剑
2018-09-26 15:48:06 +08:00
parent 8d2498f688 4e7702f0ae
commit 2e23a840ad
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+9 -9
View File
@@ -3437,16 +3437,16 @@ func (self *SGuest) GetJsonDescAtHypervisor(ctx context.Context, host *SHost) *j
TODO
srs := self.getSecurityRuleSet()
if srs.estimatedSinglePortRuleCount() <= options.FirewallFlowCountLimit {
rules := self.getSecurityRules()
if len(rules) > 0 {
desc.Add(jsonutils.NewString(rules), "security_rules")
}
rules = self.getAdminSecurityRules()
if len(rules) > 0 {
desc.Add(jsonutils.NewString(rules), "admin_security_rules")
}
}
*/
rules := self.getSecurityRules()
if len(rules) > 0 {
desc.Add(jsonutils.NewString(rules), "security_rules")
}
rules = self.getAdminSecurityRules()
if len(rules) > 0 {
desc.Add(jsonutils.NewString(rules), "admin_security_rules")
}
extraOptions := self.getExtraOptions()
if extraOptions != nil {