Merge "Set vlan-limit value depending on vlan_transparent setting" into stable/victoria
This commit is contained in:
commit
81c4e559f5
|
@ -58,6 +58,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.
|
||||||
|
@ -113,6 +119,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:
|
||||||
|
|
||||||
|
@ -207,6 +214,11 @@ outputs:
|
||||||
- {get_param: CertificateKeySize}
|
- {get_param: CertificateKeySize}
|
||||||
- {get_param: ContainerOvnCertificateKeySize}
|
- {get_param: ContainerOvnCertificateKeySize}
|
||||||
- {}
|
- {}
|
||||||
|
-
|
||||||
|
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:
|
||||||
|
|
Loading…
Reference in New Issue