Node deployment when dhcp_provider=none is broken

Attempting to deploy a local testing VM with Bifrost has revealed that node deployment with "dhcp_provider=none" appears to be broken.

2015-03-21 12:47:25.164 31163 DEBUG ironic.common.states [-] Exiting old state 'deploying' in response to event 'fail' on_exit /usr/local/lib/python2.7/dist-packages/ironic/common/states.py:177
2015-03-21 12:47:25.164 31163 DEBUG ironic.common.states [-] Entering new state 'deploy failed' in response to event 'fail' on_enter /usr/local/lib/python2.7/dist-packages/ironic/common/states.py:183
2015-03-21 12:47:25.174 31163 WARNING ironic.conductor.manager [-] Error in deploy of node a8cb6624-0d9f-c882-affc-046ebb96ec01: update_dhcp_opts() takes exactly 3 arguments (4 given)
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/dist-packages/eventlet/hubs/hub.py", line 457, in fire_timers
    timer()
  File "/usr/local/lib/python2.7/dist-packages/eventlet/hubs/timer.py", line 58, in __call__
    cb(*args, **kw)
  File "/usr/local/lib/python2.7/dist-packages/eventlet/greenthread.py", line 214, in main
    result = function(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/ironic/conductor/manager.py", line 1897, in do_node_deploy
    _("Failed to deploy. Error: %s"))
  File "/usr/local/lib/python2.7/dist-packages/oslo_utils/excutils.py", line 85, in __exit__
    six.reraise(self.type_, self.value, self.tb)
  File "/usr/local/lib/python2.7/dist-packages/ironic/conductor/manager.py", line 1892, in do_node_deploy
    new_state = task.driver.deploy.deploy(task)
  File "/usr/local/lib/python2.7/dist-packages/ironic/conductor/task_manager.py", line 128, in wrapper
    return f(*args, **kwargs)
  File "/usr/local/lib/python2.7/dist-packages/ironic/drivers/modules/agent.py", line 282, in deploy
    _do_pxe_boot(task)
  File "/usr/local/lib/python2.7/dist-packages/ironic/drivers/modules/agent.py", line 213, in _do_pxe_boot
    provider.update_dhcp(task, dhcp_opts, ports)
  File "/usr/local/lib/python2.7/dist-packages/ironic/common/dhcp_factory.py", line 94, in update_dhcp
    self.provider.update_dhcp_opts(task, dhcp_opts, ports)
TypeError: update_dhcp_opts() takes exactly 3 arguments (4 given)

This appears to be a result of changes to calls to methods made in ironic/dhcp/neutron.py that were not also made in ironic/dhcp/none.py, which was made in change Ia2500ed5afb72058b4c5e8f41307169381cbce48.