Browse Source

Merge "Set vlan-limit value depending on vlan_transparent setting" into stable/victoria

changes/42/787242/5
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
81c4e559f5
1 changed files with 12 additions and 0 deletions
  1. +12
    -0
      deployment/ovn/ovn-controller-container-puppet.yaml

+ 12
- 0
deployment/ovn/ovn-controller-container-puppet.yaml View File

@ -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:


Loading…
Cancel
Save