openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "neutron/undercloud: align configuration with instack-undercloud"

Browse Source
This commit is contained in:
Zuul 2018-03-08 12:54:40 +00:00 committed by Gerrit Code Review
commit d84995890c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
environments/undercloud.yaml
View File

@ -17,7 +17,6 @@ parameter_defaults:
NeutronBridgeMappings: ctlplane:br-ctlplane NeutronBridgeMappings: ctlplane:br-ctlplane
NeutronAgentExtensions: [] NeutronAgentExtensions: []
NeutronFlatNetworks: '*' NeutronFlatNetworks: '*'
NeutronDnsDomain: ''
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters' NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter'] NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
NovaSchedulerMaxAttempts: 30 NovaSchedulerMaxAttempts: 30
@ -62,3 +61,11 @@ parameter_defaults:
NeutronPublicInterface: eth1 NeutronPublicInterface: eth1
MistralExecutionFieldSizeLimit: 16384 MistralExecutionFieldSizeLimit: 16384
NeutronServicePlugins: ['router'] NeutronServicePlugins: ['router']
NeutronNetworkVLANRanges: 'physnet1:1000:2999'
NeutronPluginExtensions: 'port_security'
NeutronFirewallDriver: ''
NeutronNetworkType: ['local','flat','vlan','gre','vxlan']
NeutronTunnelIdRanges: '20:100'
NeutronTypeDrivers: ['local','flat','vlan','gre','vxlan']
NeutronVniRanges: '10:100'
NeutronPortQuota: '-1'

5
puppet/services/neutron-api.yaml
View File

@ -82,6 +82,10 @@ parameters:
default: '' default: ''
type: string type: string
description: Name of Open vSwitch bridge to use description: Name of Open vSwitch bridge to use
NeutronPortQuota:
default: '500'
type: string
description: Number of ports allowed per tenant, and minus means unlimited.
# DEPRECATED: the following options are deprecated and are currently maintained # DEPRECATED: the following options are deprecated and are currently maintained
# for backwards compatibility. They will be removed in the Ocata cycle. # for backwards compatibility. They will be removed in the Ocata cycle.
NeutronL3HA: NeutronL3HA:
@ -167,6 +171,7 @@ outputs:
neutron::keystone::authtoken::project_name: 'service' neutron::keystone::authtoken::project_name: 'service'
neutron::keystone::authtoken::user_domain_name: 'Default' neutron::keystone::authtoken::user_domain_name: 'Default'
neutron::keystone::authtoken::project_domain_name: 'Default' neutron::keystone::authtoken::project_domain_name: 'Default'
neutron::quota::quota_port: {get_param: NeutronPortQuota}
neutron::server::sync_db: true neutron::server::sync_db: true
tripleo.neutron_api.firewall_rules: tripleo.neutron_api.firewall_rules:
'114 neutron api': '114 neutron api':