← Back to branch summary

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

« back to all changes in this revision

Viewing changes to templates/kilo/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/kilo/neutron.conf
34
34
{% if service_plugins -%}
35
35
service_plugins = {{ service_plugins }}
36
36
{% else -%}
37
 
{% if neutron_plugin in ['ovs', 'ml2'] -%}
 
37
{% if neutron_plugin in ['ovs', 'ml2', 'Calico'] -%}
38
38
service_plugins = router,firewall,lbaas,vpnaas,metering
39
39
{% endif -%}
40
40
{% endif -%}
42
42
 
43
43
{% if neutron_security_groups -%}
44
44
allow_overlapping_ips = True
 
45
{% if neutron_plugin == 'Calico' -%}
 
46
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
 
47
{% else -%}
45
48
neutron_firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
46
49
{% endif -%}
 
50
{% endif -%}
 
51
 
 
52
{% if neutron_plugin == 'Calico' -%}
 
53
dhcp_agents_per_network = 1000
 
54
{% endif -%}
47
55
 
48
56
notify_nova_on_port_status_changes = True
49
57
notify_nova_on_port_data_changes = True