Merge "Add OVNEncapType option to the ovn controller template" into stable/train

This commit is contained in:
Zuul 2021-05-31 02:39:14 +00:00 committed by Gerrit Code Review
commit b52a959b99
1 changed files with 8 additions and 0 deletions

View File

@ -58,6 +58,13 @@ parameters:
default: "datacentre:br-ex"
tags:
- role_specific
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.
@ -159,6 +166,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}