Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 13912)
+++ /tools/gformat.py	(revision 13916)
@@ -1074,5 +1074,5 @@
     hostdump = get_yaml(host)
     if hostdump['status'] == 'up' and (hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']):
-      nameservers_cache.append((hostdump['masterip'], hostdump['nodename']))
+      nameservers_cache.append((hostdump['serviceid'], hostdump['nodename']))
 
   return nameservers_cache[0:max_servers]
