← Back to branch summary

~james-page/charms/trusty/neutron-api/lp1531102

« back to all changes in this revision

Viewing changes to templates/juno/neutron.conf

  • Committer: Subbarayudu Mukkamala
  • Date: 2015-10-27 14:50:30 UTC
  • mfrom: (153 neutron-api-274709)
  • mto: This revision was merged to the branch mainline in revision 155.
  • Revision ID: smukkamala@nuagenetworks.net-20151027145030-3lr5cofupf4tond8
Merge from lp:~openstack-charmers/charms/trusty/.../next/

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/juno/neutron.conf
31
31
 
32
32
{% if core_plugin -%}
33
33
core_plugin = {{ core_plugin }}
34
 
{% if neutron_plugin in ['ovs', 'ml2'] -%}
 
34
{% if neutron_plugin in ['ovs', 'ml2', 'Calico'] -%}
35
35
service_plugins = neutron.services.l3_router.l3_router_plugin.L3RouterPlugin,neutron.services.firewall.fwaas_plugin.FirewallPlugin,neutron.services.loadbalancer.plugin.LoadBalancerPlugin,neutron.services.vpn.plugin.VPNDriverPlugin,neutron.services.metering.metering_plugin.MeteringPlugin
36
36
{% endif -%}
37
37
{% endif -%}
38
38
 
39
39
{% if neutron_security_groups -%}
40
40
allow_overlapping_ips = True
 
41
{% if neutron_plugin == 'Calico' -%}
 
42
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
 
43
{% else -%}
41
44
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
42
45
{% endif -%}
 
46
{% endif -%}
 
47
 
 
48
{% if neutron_plugin == 'Calico' -%}
 
49
dhcp_agents_per_network = 1000
 
50
{% endif -%}
43
51
 
44
52
{% include "parts/rabbitmq" %}
45
53
 
61
69
{% endif %}
62
70
 
63
71
[quotas]
 
72
{% if quota_driver -%}
 
73
quota_driver = {{ quota_driver }}
 
74
{% else -%}
64
75
quota_driver = neutron.db.quota_db.DbQuotaDriver
 
76
{% endif -%}
65
77
{% if neutron_security_groups -%}
66
78
quota_items = network,subnet,port,security_group,security_group_rule
67
79
{% endif -%}