Set vlan-limit value depending on vlan_transparent setting

In case when vlan_transparent in Neutron is enabled,
other_config:vlan-limit should be set to value "0" in the openvswitch on
all nodes.

Related-Bug: #1918418

Depends-On: https://review.opendev.org/c/openstack/puppet-vswitch/+/783859
Change-Id: Id6fc08bce5673a41fd9fa5cb27f41c9786f560da
(cherry picked from commit e6801cebc8)
This commit is contained in:
Slawek Kaplonski 2021-03-10 10:53:16 +00:00
parent b3d499dc3b
commit 71fb10fe28
1 changed files with 12 additions and 0 deletions

View File

@ -65,6 +65,12 @@ parameters:
default: "geneve"
constraints:
- allowed_values: ["geneve", "vxlan"]
EnableVLANTransparency:
default: false
description: >
If True, then allow plugins that support it to create VLAN
transparent networks.
type: boolean
OVNIntegrationBridge:
description: >
Name of the OVS bridge to use as integration bridge by OVN Controller.
@ -127,6 +133,7 @@ conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
insecure_registry_is_empty: {equals : [{get_param: DockerInsecureRegistryAddress}, []]}
key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']}
enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]}
resources:
@ -206,6 +213,11 @@ outputs:
- {get_param: CertificateKeySize}
- {get_param: ContainerOvnCertificateKeySize}
- {}
-
if:
- enable_vlan_transparency
- vswitch::ovs::vlan_limit: 0
- {}
service_config_settings: {}
# BEGIN DOCKER SETTINGS
puppet_config: