From 4260d30eae0b83789d0bdb9b027be7e88176e187 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Wed, 10 Mar 2021 10:53:16 +0000 Subject: [PATCH] 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/+/783215 Change-Id: Id6fc08bce5673a41fd9fa5cb27f41c9786f560da (cherry picked from commit e6801cebc81f25b6198cf29b4a5ab7308e16d5fd) --- deployment/ovn/ovn-controller-container-puppet.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 18b2f49a65..eced2d878c 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -58,6 +58,12 @@ parameters: default: "datacentre:br-ex" tags: - role_specific + 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. @@ -113,6 +119,7 @@ conditions: force_config_drive: {equals: [{get_param: OVNMetadataEnabled}, false]} internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]} key_size_override_unset: {equals: [{get_param: ContainerOvnCertificateKeySize}, '']} + enable_vlan_transparency: {equals: [{get_param: EnableVLANTransparency}, true]} resources: @@ -207,6 +214,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: