Changeset 10934 in genesis for tools

Timestamp:

May 20, 2012, 1:10:59 AM (13 years ago)

Author:

rick

Message:

Make the nameserver a seperate call as we need it later on.

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -824 +824 @@
 
 
+nameservers_cache = {}
+def get_nameservers():
+  if nameservers_cache:
+    return nameservers_cache
+
+  for host in get_proxylist() + get_hybridlist():
+    hostdump = get_yaml(host)
+    nameservers_cache[hostdump['masterip']] = hostdump['autogen_realname'] 
+
+  return nameservers_cache
+
+
 def generate_resolv_conf(datadump):
   """ Generate configuration file '/etc/resolv.conf' """
@@ -829 +841 @@
   datadump['autogen_header'] = generate_header(datadump, "#")
   datadump['autogen_edge_nameservers'] = ''
-  for host in get_proxylist():
-    hostdump = get_yaml(host)
-    datadump['autogen_edge_nameservers'] += "nameserver %(masterip)-15s # %(autogen_realname)s\n" % hostdump
-  for host in get_hybridlist():
-    hostdump = get_yaml(host)
-    if hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']:
-      datadump['autogen_edge_nameservers'] += "nameserver %(masterip)-15s # %(autogen_realname)s\n" % hostdump
+
+
+  for masterip,realname in get_nameservers().iteritems():
+    datadump['autogen_edge_nameservers'] += "nameserver %-15s # %s\n" % (masterip, realname)
 
   return Template("""\