Merge "Add OVNEncapType option to the ovn controller template" into stable/train
This commit is contained in:
commit
b52a959b99
|
@ -58,6 +58,13 @@ parameters:
|
||||||
default: "datacentre:br-ex"
|
default: "datacentre:br-ex"
|
||||||
tags:
|
tags:
|
||||||
- role_specific
|
- 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:
|
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.
|
||||||
|
@ -159,6 +166,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}
|
||||||
|
|
Loading…
Reference in New Issue