Merge "Make vlan_transparent in neutron.conf configurable from Undercloud" into stable/queens
This commit is contained in:
commit
c149fccaa3
|
@ -116,6 +116,12 @@ parameters:
|
||||||
EnableInternalTLS:
|
EnableInternalTLS:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
EnableVLANTransparency:
|
||||||
|
default: false
|
||||||
|
description: >
|
||||||
|
If True, then allow plugins that support it to create VLAN
|
||||||
|
transparent networks.
|
||||||
|
type: boolean
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
|
dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
|
||||||
|
@ -152,6 +158,7 @@ outputs:
|
||||||
neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
|
neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
|
||||||
neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}
|
neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}
|
||||||
neutron::db::sync::extra_params: {get_param: NeutronDBSyncExtraParams}
|
neutron::db::sync::extra_params: {get_param: NeutronDBSyncExtraParams}
|
||||||
|
neutron::vlan_transparent: {get_param: EnableVLANTransparency}
|
||||||
- if:
|
- if:
|
||||||
- dhcp_agents_zero
|
- dhcp_agents_zero
|
||||||
- {}
|
- {}
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue