← Back to branch summary

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

« back to all changes in this revision

Viewing changes to templates/kilo/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/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
65
73
{% include "section-zeromq" %}
66
74
 
67
75
[quotas]
 
76
{% if quota_driver -%}
 
77
quota_driver = {{ quota_driver }}
 
78
{% else -%}
68
79
quota_driver = neutron.db.quota_db.DbQuotaDriver
 
80
{% endif -%}
69
81
{% if neutron_security_groups -%}
70
82
quota_items = network,subnet,port,security_group,security_group_rule
71
83
quota_security_group = {{ quota_security_group }}