diff options
| author |   Frank Brockners <fbrockne@cisco.com> | 2015-06-17 18:06:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-06-17 18:06:38 +0000 |
| commit | c52a2ce8490535fe839a47b46eb42c458d39106a (patch) | |
| tree | d229414c42512fa90233a54518e47ea51556ad99 /common | |
| parent | fbac78cb5277b044f3318c831d4da92663097a6c (diff) | |
| parent | f5b30fa73a637c93d764467336d9721060dbe15a (diff) | |
Merge "Fixes external network bridge and adds quota limits"
Diffstat (limited to 'common')
| -rw-r--r-- | common/puppet-opnfv/manifests/controller_networker.pp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/common/puppet-opnfv/manifests/controller_networker.pp b/common/puppet-opnfv/manifests/controller_networker.pp index 157bc8f..b148ec8 100644 --- a/common/puppet-opnfv/manifests/controller_networker.pp +++ b/common/puppet-opnfv/manifests/controller_networker.pp @@ -302,6 +302,7 @@ class opnfv::controller_networker { class { "quickstack::pacemaker::neutron": agent_type => $this_agent, enable_tunneling => 'true', + external_network_bridge => 'br-ex', ml2_mechanism_drivers => $ml2_mech_drivers, ml2_network_vlan_ranges => ["physnet1:10:50"], odl_controller_ip => $odl_control_ip, @@ -309,6 +310,18 @@ class opnfv::controller_networker { ovs_tunnel_iface => $ovs_tunnel_if, ovs_tunnel_types => ["vxlan"], verbose => 'true', + neutron_conf_additional_params => { default_quota => 'default', + quota_network => '50', + quota_subnet => '50', + quota_port => 'default', + quota_security_group => '50', + quota_security_group_rule => 'default', + quota_vip => 'default', + quota_pool => 'default', + quota_router => '50', + quota_floatingip => '100', + network_auto_schedule => 'default', + }, } if ($external_network_flag != '') and str2bool($external_network_flag) { |