openstack/tripleo-heat-templates
Code Issues Proposed changes

neutron/undercloud: align configuration with instack-undercloud

Browse Source 
Align the Neutron configuration between a containerized undercloud and a
containerized deployed by instack-undercloud.
It'll help with upgrades and such.

Depends-On: I9c23f7fcc10e297c805e7c08433003cd86300b0b
Depends-On: Iea0031b528fcdd164ab2f7d6c26521b0b07051a1
Change-Id: Id2957c9c453229b9f280ef10558027407160f25b
This commit is contained in:
Emilien Macchi 2018-03-06 23:14:30 +01:00
parent c90e492d7e
commit 42a032aac9
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

@ -15,7 +15,6 @@ parameter_defaults:
NeutronBridgeMappings: ctlplane:br-ctlplane
NeutronAgentExtensions: []
NeutronFlatNetworks: '*'
NeutronDnsDomain: ''
NovaSchedulerAvailableFilters: 'tripleo_common.filters.list.tripleo_filters'
NovaSchedulerDefaultFilters: ['RetryFilter', 'TripleOCapabilitiesFilter', 'ComputeCapabilitiesFilter', 'AvailabilityZoneFilter', 'RamFilter', 'DiskFilter', 'ComputeFilter', 'ImagePropertiesFilter', 'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
NovaSchedulerMaxAttempts: 30
@ -51,3 +50,11 @@ parameter_defaults:
NeutronPublicInterface: eth1
MistralExecutionFieldSizeLimit: 16384
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: ''
type: string
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
# for backwards compatibility. They will be removed in the Ocata cycle.
NeutronL3HA:
@ -167,6 +171,7 @@ outputs:
neutron::keystone::authtoken::project_name: 'service'
neutron::keystone::authtoken::user_domain_name: 'Default'
neutron::keystone::authtoken::project_domain_name: 'Default'
neutron::quota::quota_port: {get_param: NeutronPortQuota}
neutron::server::sync_db: true
tripleo.neutron_api.firewall_rules:
'114 neutron api':