From f5b30fa73a637c93d764467336d9721060dbe15a Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 8 Jun 2015 13:11:56 -0400 Subject: Fixes external network bridge and adds quota limits Issue where external network router port was being placed on br-int. Port will now be properly added to br-ex. Patch also includes increased quota limits for neutron. JIRA: BGS-65 Change-Id: I30de85e4ef241b567a90011d08c0cb4ad97fe411 Signed-off-by: Tim Rozet --- common/puppet-opnfv/manifests/controller_networker.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'common/puppet-opnfv/manifests') 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) { -- cgit 1.2.3-korg