Merge pull request #140 from salv-orlando/force_disable_flag312

Force wait_for_security_policy_sync to False
vmware · Jul 15, 2021 · 67bf886 · 67bf886
2 parents e26d364 + 8eb4916
commit 67bf886
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.2
+3.1.2.1
diff --git a/pkg/controller/configmap/config.go b/pkg/controller/configmap/config.go
@@ -58,6 +58,7 @@ func (adaptor *ConfigMapK8s) FillDefaults(configmap *corev1.ConfigMap, spec *con
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "enable_snat", "True", false))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "ha", "enable", "True", false))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_node_agent", "mtu", strconv.Itoa(operatortypes.DefaultMTU), false))
+	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "False", true))
 	// Write config back to ConfigMap data
 	(*data)[operatortypes.ConfigMapDataKey], err = iniWriteToString(cfg)
 	appendErrorIfNotNil(&errs, err)
@@ -80,7 +81,7 @@ func (adaptor *ConfigMapOc) FillDefaults(configmap *corev1.ConfigMap, spec *conf
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "adaptor", "openshift4", true))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "policy_nsxapi", "True", true))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "single_tier_topology", "True", true))
-	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "True", false))
+	appendErrorIfNotNil(&errs, fillDefault(cfg, "nsx_v3", "wait_for_security_policy_sync", "False", true))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "coe", "enable_snat", "True", false))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "ha", "enable", "True", false))
 	appendErrorIfNotNil(&errs, fillDefault(cfg, "k8s", "process_oc_network", "False", true))