Changeset 13418 in genesis


Ignore:
Timestamp:
Oct 3, 2015, 9:20:32 PM (7 years ago)
Author:
rick
Message:

Weed out CNode legacy code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/gformat.py

    r13405 r13418  
    835835    {% endif -%}
    836836  {% endif -%}
    837 {% elif nodetype == "CNode" %}
    838 #
    839 # NODE iLeiden Configuration
    840 #
    841 
    842 # iLeiden Proxies {{ autogen_ileiden_proxies_names }}
    843 list_ileiden_proxies="{{ autogen_ileiden_proxies_ips }}"
    844 # normal Proxies {{ autogen_normal_proxies_names }}
    845 list_normal_proxies="{{ autogen_normal_proxies_ips }}"
    846 
    847 captive_portal_interfaces="{{ autogen_dhcp_interfaces|join(',') }}"
    848 
    849 lvrouted_flags="-u -s s00p3rs3kr3t -m 28 -z $list_ileiden_proxies"
    850837{% endif %}
    851838
     
    13411328    # Proxy naming convention is special
    13421329    fqdn = datadump['nodename']
    1343     if datadump['nodetype'] in ['CNode', 'Hybrid']:
     1330    if datadump['nodetype'] in ['Hybrid']:
    13441331      wleiden_cname[datadump['nodename']] = fqdn
    13451332 
     
    14311418  # Format:
    14321419  ##; this is a comment
    1433   ## roomburgh=CNodeRoomburgh1
    1434   ## apkerk1.CNodeVosko=172.17.176.8 ;this as well
     1420  ## roomburgh=Roomburgh1
     1421  ## apkerk1.Vosko=172.17.176.8 ;this as well
    14351422  dns_list = yaml.load(open(os.path.join(NODE_DIR,'../dns/staticDNS.yaml'),'r'))
    14361423
Note: See TracChangeset for help on using the changeset viewer.