Index: /nodes/gformat.py
===================================================================
--- /nodes/gformat.py	(revision 8261)
+++ /nodes/gformat.py	(revision 8262)
@@ -123,5 +123,7 @@
 
   for iface_key in datadump['iface_keys']:
-    output += "## %(interface)s %(desc)s\n" % datadump[iface_key]
+    if not datadump[iface_key].has_key('comment'):
+      datadump[iface_key]['comment'] = None
+    output += "## %(interface)s - %(desc)s - %(comment)s\n" % datadump[iface_key]
 
     try:
@@ -129,5 +131,5 @@
       (ip, netmask) = datadump[iface_key]['ip'].split('/')
       datadump[iface_key]['subnet'] = netmask2subnet(netmask)
-    except AttributeError:
+    except (AttributeError, ValueError):
       output += "# not autoritive\n\n"
       continue
@@ -238,5 +240,4 @@
   """ Get configuration yaml for 'item'"""
   gfile = NODE_DIR + '/%s/wleiden.yaml' % item
-  gfile = 'test.yaml'
 
   f = open(gfile, 'r')
@@ -277,4 +278,5 @@
   output = generate_header("#")
   output += "# Genesis config yaml style\n" 
+  output += "# vim:ts=2:et:sw=2:ai\n"
   output += "#\n"
   iface_keys = [elem for elem in datadump.keys() if elem.startswith('iface_')]
@@ -286,5 +288,7 @@
   for iface_key in sorted(iface_keys):
     output += "%s:\n" % iface_key
-    output += yaml.dump(datadump[iface_key], default_flow_style=False)
+    for key in sorted(datadump[iface_key]):
+      #output += yaml.dump(datadump[iface_key], default_flow_style=False)
+      output += "  %s: %s\n" % (key, datadump[iface_key][key]) 
     output += "\n\n"