Merge "Make vlan_transparent in neutron.conf configurable from Undercloud" into stable/queens

This commit is contained in:
Zuul 2018-10-10 08:28:11 +00:00 committed by Gerrit Code Review
commit c149fccaa3
2 changed files with 12 additions and 0 deletions

View File

@ -116,6 +116,12 @@ parameters:
EnableInternalTLS:
type: boolean
default: false
EnableVLANTransparency:
default: false
description: >
If True, then allow plugins that support it to create VLAN
transparent networks.
type: boolean
conditions:
dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
@ -152,6 +158,7 @@ outputs:
neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}
neutron::db::sync::extra_params: {get_param: NeutronDBSyncExtraParams}
neutron::vlan_transparent: {get_param: EnableVLANTransparency}
- if:
- dhcp_agents_zero
- {}

View File

@ -0,0 +1,5 @@
---
features:
- Allow plugins that support it to create VLAN transparent networks
The vlan_transparent determines if plugins that support it to
create VLAN transparent networks or not