Merge "Support setting ovn-ofctrl-wait-before-clear" into stable/zed

deployment/ovn/ovn-controller-container-puppet.yaml

@@ -131,6 +131,12 @@ parameters:
       OpenvSwitch integration bridge, in seconds.
     type: number
     default: 60
+  OVNOfctrlWaitBeforeClear:
+    description: >
+      Sets the time ovn-controller will wait on startup before clearing all
+      openflow rules and installing the new ones.
+    type: number
+    default: 8000
   CertificateKeySize:
     type: string
     default: '2048'
@@ -293,6 +299,7 @@ outputs:
             ovn::controller::hostname: "%{lookup('fqdn_canonical')}"
             ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
             ovn::controller::ovn_openflow_probe_interval: {get_param: OVNOpenflowProbeInterval}
+            ovn::controller::ovn_ofctrl_wait_before_clear: {get_param: OVNOfctrlWaitBeforeClear}
             nova::compute::force_config_drive:
               if:
                 - not: {get_param: OVNMetadataEnabled}