diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index ff0f64d3ae..e66a61fd42 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -17,7 +17,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 @@ -62,3 +61,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' diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index 236a333b42..9b741c205f 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -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':