Merge pull request #2269 from minrk/disambiguate_ip

add missing location when disambiguating controller IP.

Fixes a recently introduced bug that prevented ip=* from resolving correctly engine-side (would always give loopback).

IPython/parallel/apps/ipengineapp.py

@@ -226,7 +226,7 b' class IPEngineApp(BaseParallelApplication):'
         location = config.EngineFactory.location
         
         proto, ip = d['interface'].split('://')
-        ip = disambiguate_ip_address(ip)
+        ip = disambiguate_ip_address(ip, location)
         d['interface'] = '%s://%s' % (proto, ip)
         
         # DO NOT allow override of basic URLs, serialization, or exec_key