Changeset 13418 in genesis for tools/gformat.py

Timestamp:

Oct 3, 2015, 9:20:32 PM (9 years ago)

Author:

rick

Message:

Weed out CNode legacy code

File:

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

tools/gformat.py

@@ -835 +835 @@
     {% endif -%}
   {% endif -%}
-{% elif nodetype == "CNode" %}
-#
-# NODE iLeiden Configuration
-#
-
-# iLeiden Proxies {{ autogen_ileiden_proxies_names }}
-list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
-# normal Proxies {{ autogen_normal_proxies_names }}
-list_normal_proxies="{{ autogen_normal_proxies_ips }}"
-
-captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
-
-lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
 {% endif %}
 
@@ -1341 +1328 @@
     # Proxy naming convention is special
     fqdn = datadump['nodename']
-    if datadump['nodetype'] in ['CNode', 'Hybrid']:
+    if datadump['nodetype'] in ['Hybrid']:
       wleiden_cname[datadump['nodename']] = fqdn
  
@@ -1431 +1418 @@
   # Format:
   ##; this is a comment
-  ## roomburgh=CNodeRoomburgh1
-  ## apkerk1.CNodeVosko=172.17.176.8 ;this as well
+  ## roomburgh=Roomburgh1
+  ## apkerk1.Vosko=172.17.176.8 ;this as well
   dns_list = yaml.load(open(os.path.join(NODE_DIR,'../dns/staticDNS.yaml'),'r'))