Skip to content

Commit

Permalink
Merge pull request rcbops-cookbooks#121 from Apsu/master
Browse files Browse the repository at this point in the history
Merged automatically by jenkins after successful build test
  • Loading branch information
rcbjenkins committed Feb 13, 2014
2 parents 491cb31 + 10318fb commit 7c2c124
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions templates/default/neutron.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ dhcp_lease_duration = <%= @dhcp_lease_time %>
# Seconds elapsed until an agent is considered down
agent_down_time = <%= @agent_down_time %>

# Disable builtin schedulers
network_auto_schedule = False
router_auto_schedule = False

[AGENT]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
polling_interval = 2
Expand Down

0 comments on commit 7c2c124

Please sign in to comment.