Merge "Add OVNEncapType option to the ovn controller template"

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

@@ -61,6 +61,13 @@ parameters:
         If True, then allow plugins that support it to create VLAN
         transparent networks.
     type: boolean
+  OVNEncapType:
+    description: >
+      Type of encapsulation used in OVN. It can be "geneve" or "vxlan".
+    type: string
+    default: "geneve"
+    constraints:
+      - allowed_values: ["geneve", "vxlan"]
   OVNIntegrationBridge:
     description: >
       Name of the OVS bridge to use as integration bridge by OVN Controller.
@@ -179,6 +186,7 @@ outputs:
                    "%{hiera('$NETWORK')}"
                  params:
                    $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
+            ovn::controller::ovn_encap_type: {get_param: OVNEncapType}
             ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
             ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
             ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}