← Back to branch summary

~ionutbalutoiu/charms/trusty/neutron-api/next

« back to all changes in this revision

Viewing changes to templates/icehouse/neutron.conf

  • Committer: James Page
  • Date: 2015-09-04 11:03:14 UTC
  • mfrom: (39.7.35 trunk)
  • Revision ID: james.page@ubuntu.com-20150904110314-1iym0vseisumy5d0
[project-calico,r=james-page] Add support for Calico plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/neutron.conf
30
30
{% if service_plugins -%}
31
31
service_plugins = {{ service_plugins }}
32
32
{% else -%}
33
 
{% if neutron_plugin in ['ovs', 'ml2'] -%}
 
33
{% if neutron_plugin in ['ovs', 'ml2', 'Calico'] -%}
34
34
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
35
35
{% endif -%}
36
36
{% 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