Merge branch 'bug/add-new-sg-default-action/ZSTAC-9913@@2' into 'master'

Add new security group default action drop Closes ZSTAC-9913 See merge request zstackio/zstack!2359
ZqyDaoDao · Mar 20, 2018 · 58fc4d3 · 58fc4d3
2 parents 29ed1f7 + 2c95957
commit 58fc4d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conf/globalConfig/securityGroupManager.xml b/conf/globalConfig/securityGroupManager.xml
@@ -28,7 +28,7 @@
     <config>
         <name>ingress.defaultPolicy</name>
         <description>Default policy for ingress traffic when security group is empty</description>
-        <defaultValue>deny</defaultValue>
+        <defaultValue>drop</defaultValue>
         <category>securityGroup</category>
     </config>
 

diff --git a/...curityGroup/src/main/java/org/zstack/network/securitygroup/SecurityGroupGlobalConfig.java b/...curityGroup/src/main/java/org/zstack/network/securitygroup/SecurityGroupGlobalConfig.java
@@ -16,7 +16,7 @@ public class SecurityGroupGlobalConfig {
     public static GlobalConfig FAILURE_HOST_EACH_TIME_TO_TAKE = new GlobalConfig(CATEGORY, "host.failureResolvePerTime");
     @GlobalConfigValidation(numberGreaterThan = -1)
     public static GlobalConfig DELAY_REFRESH_INTERVAL = new GlobalConfig(CATEGORY, "refresh.delayInterval");
-    @GlobalConfigValidation(validValues = {"accept", "deny"})
+    @GlobalConfigValidation(validValues = {"accept", "deny", "drop"})
     public static GlobalConfig INGRESS_RULE_DEFAULT_POLICY = new GlobalConfig(CATEGORY, "ingress.defaultPolicy");
     @GlobalConfigValidation(validValues = {"accept", "deny"})
     public static GlobalConfig EGRESS_RULE_DEFAULT_POLICY = new GlobalConfig(CATEGORY, "egress.defaultPolicy");