Merge "Set vlan-limit value depending on vlan_transparent setting" into stable/train

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

@@ -65,6 +65,12 @@ parameters:
     default: "geneve"
     constraints:
       - allowed_values: ["geneve", "vxlan"]
+  EnableVLANTransparency:
+    default: false
+    description: >
+        If True, then allow plugins that support it to create VLAN
+        transparent networks.
+    type: boolean
   OVNIntegrationBridge:
     description: >
       Name of the OVS bridge to use as integration bridge by OVN Controller.
@@ -127,6 +133,7 @@ conditions:
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
   insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
   key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
+  enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]}
 
 resources:
 
@@ -206,6 +213,11 @@ outputs:
                     - {get_param: CertificateKeySize}
                     - {get_param: ContainerOvnCertificateKeySize}
             - {}
+          -
+            if:
+            - enable_vlan_transparency
+            - vswitch::ovs::vlan_limit: 0
+            - {}
       service_config_settings: {}
       # BEGIN DOCKER SETTINGS
       puppet_config: