Merge "Neutron: Rename VnicTypeBlacklist parameters"
This commit is contained in:
commit
35fbc6c874
|
@ -84,18 +84,18 @@ parameters:
|
||||||
value in ML2 plugin. And overwrite values from global_physnet_mtu for
|
value in ML2 plugin. And overwrite values from global_physnet_mtu for
|
||||||
selected network.
|
selected network.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
NeutronOvsVnicTypeBlacklist:
|
NeutronOvsVnicTypeProhibitlist:
|
||||||
description: |
|
description: |
|
||||||
Comma-separated list of VNIC types for which support in Neutron is
|
Comma-separated list of VNIC types for which support in Neutron is
|
||||||
administratively prohibited by the OVS mechanism driver.
|
administratively prohibited by the OVS mechanism driver.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
default: ""
|
default: []
|
||||||
NeutronSriovVnicTypeBlacklist:
|
NeutronSriovVnicTypeProhibitlist:
|
||||||
description: >
|
description: >
|
||||||
Comma-separated list of VNIC types for which support in Neutron is
|
Comma-separated list of VNIC types for which support in Neutron is
|
||||||
administratively prohibited by the SR-IOV mechanism driver.
|
administratively prohibited by the SR-IOV mechanism driver.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
default: ""
|
default: []
|
||||||
# DEPRECATED: the NeutronFirewallDriver option is deprecated and is currently
|
# DEPRECATED: the NeutronFirewallDriver option is deprecated and is currently
|
||||||
# maintained for backwards compatibility. It has no any effect on the
|
# maintained for backwards compatibility. It has no any effect on the
|
||||||
# deployment and will be removed in the W release.
|
# deployment and will be removed in the W release.
|
||||||
|
@ -104,6 +104,18 @@ parameters:
|
||||||
description: Firewall driver for realizing neutron security group function
|
description: Firewall driver for realizing neutron security group function
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
|
NeutronOvsVnicTypeBlacklist:
|
||||||
|
description: |
|
||||||
|
Comma-separated list of VNIC types for which support in Neutron is
|
||||||
|
administratively prohibited by the OVS mechanism driver.
|
||||||
|
type: comma_delimited_list
|
||||||
|
default: []
|
||||||
|
NeutronSriovVnicTypeBlacklist:
|
||||||
|
description: >
|
||||||
|
Comma-separated list of VNIC types for which support in Neutron is
|
||||||
|
administratively prohibited by the SR-IOV mechanism driver.
|
||||||
|
type: comma_delimited_list
|
||||||
|
default: []
|
||||||
|
|
||||||
parameter_groups:
|
parameter_groups:
|
||||||
- label: deprecated
|
- label: deprecated
|
||||||
|
@ -115,9 +127,13 @@ parameter_groups:
|
||||||
parameters:
|
parameters:
|
||||||
- NeutronOverlayIPVersion
|
- NeutronOverlayIPVersion
|
||||||
- NeutronFirewallDriver
|
- NeutronFirewallDriver
|
||||||
|
- NeutronOvsVnicTypeBlacklist
|
||||||
|
- NeutronSriovVnicTypeBlacklist
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
physical_network_mtus_set: {not: {equals: [{get_param: NeutronML2PhysicalNetworkMtus}, []]}}
|
physical_network_mtus_set: {not: {equals: [{get_param: NeutronML2PhysicalNetworkMtus}, []]}}
|
||||||
|
ovs_vnic_type_prohibit_list_set: {not: {equals: [{get_param: NeutronOvsVnicTypeProhibitlist}, []]}}
|
||||||
|
sriov_vnic_type_prohibit_list_set: {not: {equals: [{get_param: NeutronSriovVnicTypeProhibitlist}, []]}}
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
NeutronBase:
|
NeutronBase:
|
||||||
|
@ -145,8 +161,16 @@ outputs:
|
||||||
neutron::plugins::ml2::tunnel_id_ranges: {get_param: NeutronTunnelIdRanges}
|
neutron::plugins::ml2::tunnel_id_ranges: {get_param: NeutronTunnelIdRanges}
|
||||||
neutron::plugins::ml2::vni_ranges: {get_param: NeutronVniRanges}
|
neutron::plugins::ml2::vni_ranges: {get_param: NeutronVniRanges}
|
||||||
neutron::plugins::ml2::tenant_network_types: {get_param: NeutronNetworkType}
|
neutron::plugins::ml2::tenant_network_types: {get_param: NeutronNetworkType}
|
||||||
neutron::plugins::ml2::ovs_driver::vnic_type_blacklist: {get_param: NeutronOvsVnicTypeBlacklist}
|
neutron::plugins::ml2::ovs_driver::vnic_type_prohibitlist:
|
||||||
neutron::plugins::ml2::sriov_driver::vnic_type_blacklist: {get_param: NeutronSriovVnicTypeBlacklist}
|
if:
|
||||||
|
- ovs_vnic_type_prohibit_list_set
|
||||||
|
- {get_param: NeutronOvsVnicTypeProhibitlist}
|
||||||
|
- {get_param: NeutronOvsVnicTypeBlacklist}
|
||||||
|
neutron::plugins::ml2::sriov_driver::vnic_type_prohibitlist:
|
||||||
|
if:
|
||||||
|
- sriov_vnic_type_prohibit_list_set
|
||||||
|
- {get_param: NeutronSriovVnicTypeProhibitlist}
|
||||||
|
- {get_param: NeutronSriovVnicTypeBlacklist}
|
||||||
neutron::plugins::ml2::overlay_ip_version:
|
neutron::plugins::ml2::overlay_ip_version:
|
||||||
get_param:
|
get_param:
|
||||||
- ServiceData
|
- ServiceData
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``Neutron(OVS|Vnic)VnicTypeBlackList`` parameters are deprecated in
|
||||||
|
favor of the new ``Neutron(OVS|Sriov)VnicTypeProhibitList`` parameters.
|
Loading…
Reference in New Issue