From 908bb8a008d1e4d476301c730d087cfb8a32df41 Mon Sep 17 00:00:00 2001 From: git-harry Date: Wed, 29 Oct 2014 13:30:34 +0000 Subject: [PATCH] Fix neutron template for dhcp_agents_per_network A value of False raises the exception: NoSuchOptError: no such option: dhcp_agents_per_network If the option is not required this patch will keep it out of the conf file. Issue: #973 --- templates/default/neutron.conf.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/default/neutron.conf.erb b/templates/default/neutron.conf.erb index d3e822d..d0ee6fb 100644 --- a/templates/default/neutron.conf.erb +++ b/templates/default/neutron.conf.erb @@ -50,7 +50,9 @@ router_auto_schedule = <%= @router_auto_schedule %> # # RPC: only relevant when network_auto_schedule = True and rpcdaemon # is not in use. +<% if @dhcp_agents_per_network != "False" %> dhcp_agents_per_network = <%= @dhcp_agents_per_network %> +<% end %> [database] max_pool_size = <%= @sql_max_pool_size %>