openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2021-05-20 15:40:07 +00:00 committed by Gerrit Code Review
parent 0aa57528aa b4cec5b729
commit 06c0fc35c6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -64,6 +64,13 @@ parameters:
If True, then allow plugins that support it to create VLAN If True, then allow plugins that support it to create VLAN
transparent networks. transparent networks.
type: boolean 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: OVNIntegrationBridge:
description: > description: >
Name of the OVS bridge to use as integration bridge by OVN Controller. Name of the OVS bridge to use as integration bridge by OVN Controller.
@ -182,6 +189,7 @@ outputs:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]} $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_encap_type: {get_param: OVNEncapType}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
ovn::controller::hostname: "%{hiera('fqdn_canonical')}" ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval} ovn::controller::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}