← Back to branch summary

~opnfv-team/charms/trusty/neutron-api/next

« back to all changes in this revision

Viewing changes to templates/icehouse/neutron.conf

  • Committer: David Ames
  • Date: 2016-01-21 19:36:42 UTC
  • mfrom: (164.2.3 neutron-api)
  • Revision ID: david.ames@canonical.com-20160121193642-gmqqo4f0kl7cx7nf
[tinwood, r=thedac] Fixes Bug#1475534 Added config option 'dhcp-agents-per-network'

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/neutron.conf
47
47
 
48
48
{% if neutron_plugin == 'Calico' -%}
49
49
dhcp_agents_per_network = 1000
 
50
{% else -%}
 
51
dhcp_agents_per_network = {{ dhcp_agents_per_network }}
50
52
{% endif -%}
51
53
 
52
54
{% include "parts/rabbitmq" %}
82
84
quota_items = network,subnet,port
83
85
{% endif -%}
84
86
quota_network = {{ quota_network }}
85
 
quota_subnet = {{ quota_subnet }} 
 
87
quota_subnet = {{ quota_subnet }}
86
88
quota_port = {{ quota_port }}
87
89
quota_vip = {{ quota_vip }}
88
90
quota_pool = {{ quota_pool }}