openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Restrict tenant network to geneve" into stable/queens

Browse Source
This commit is contained in:
Zuul 2018-05-03 02:45:21 +00:00 committed by Gerrit Code Review
commit 6e0e2e826d
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
puppet/services/neutron-plugin-ml2-ovn.yaml
View File

@ -71,6 +71,17 @@ parameters:
description: Whether Metadata Service has to be enabled
type: boolean
default: true
# NOTE(anil): OVN supports only VLAN and geneve networks. But VLAN
# tenant networks have a limited support in OVN. So allowing only
# geneve networks until the problems are addressed.
# See bug #1767070 for more information.
NeutronNetworkType:
default: 'geneve'
description: The tenant network type for Neutron.
type: comma_delimited_list
constraints:
- allowed_values:
- geneve
resources:
@ -101,6 +112,7 @@ outputs:
neutron::server::qos_notification_drivers: {get_param: OVNQosDriver}
neutron::plugins::ml2::max_header_size: {get_param: NeutronGeneveMaxHeaderSize}
neutron::plugins::ml2::ovn::dvr_enabled: {get_param: NeutronEnableDVR}
neutron::plugins::ml2::tenant_network_types: {get_param: NeutronNetworkType}
step_config: |
include ::tripleo::profile::base::neutron::plugins::ml2
metadata_settings:

10
tools/yaml-validate.py
View File

@ -113,6 +113,16 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
'BondInterfaceOvsOptions': ['description',
'default',
'constraints'],
# NOTE(anil): This is a temporary change and
# will be removed once bug #1767070 properly
# fixed. OVN supports only VLAN and geneve
# for NeutronNetworkType. But VLAN tenant
# networks have a limited support in OVN.
# Till that is fixed, we restrict
# NeutronNetworkType to 'geneve'.
'NeutronNetworkType': ['description',
'default',
'constraints'],
'KeyName': ['constraints'],
'OVNSouthboundServerPort': ['description'],
'ExternalInterfaceDefaultRoute':