Merge branch 'develop' into feature/use-cached-subnets

inventory_provider/tasks/worker.py

@@ -554,10 +554,7 @@ def _build_subnet_db(update_callback=lambda s: None):
         info = r.get(k.decode('utf-8')).decode('utf-8')
         info = json.loads(info)
         entry = subnets.setdefault(info['interface address'], [])
-        entry.append({
-            'interface name': info['interface name'],
-            'router': info['router']
-        })
+        entry.append(info)
 
     update_callback('saving {} subnets'.format(len(subnets)))