Merge "Set vlan-limit value depending on vlan_transparent setting"

This commit is contained in:
Zuul 2021-03-31 00:25:32 +00:00 committed by Gerrit Code Review
commit 0e97b71fdb
1 changed files with 12 additions and 0 deletions

View File

@ -55,6 +55,12 @@ parameters:
default: "datacentre:br-ex" default: "datacentre:br-ex"
tags: tags:
- role_specific - role_specific
EnableVLANTransparency:
default: false
description: >
If True, then allow plugins that support it to create VLAN
transparent networks.
type: boolean
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.
@ -110,6 +116,7 @@ conditions:
force_config_drive: {equals: [{get_param: OVNMetadataEnabled}, false]} force_config_drive: {equals: [{get_param: OVNMetadataEnabled}, false]}
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']} key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]}
resources: resources:
@ -186,6 +193,11 @@ outputs:
- -
tripleo::profile::base::neutron::agents::ovn::protocol: 'ssl' tripleo::profile::base::neutron::agents::ovn::protocol: 'ssl'
- {} - {}
-
if:
- enable_vlan_transparency
- vswitch::ovs::vlan_limit: 0
- {}
service_config_settings: {} service_config_settings: {}
# BEGIN DOCKER SETTINGS # BEGIN DOCKER SETTINGS
puppet_config: puppet_config: