Changeset 13405 in genesis

Timestamp:

Sep 20, 2015, 7:17:01 PM (9 years ago)

Author:

rick

Message:

Hybrid* will also be removed from references to in FQDN

File:

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

tools/gformat.py

@@ -238 +238 @@
     datadump['autogen_item'] = item
 
-    datadump['autogen_realname'] = get_realname(datadump)
     datadump['autogen_domain'] = datadump['domain'] if datadump.has_key('domain') else 'wleiden.net.'
-    datadump['autogen_fqdn'] = datadump['autogen_realname'] + '.' + datadump['autogen_domain']
+    datadump['autogen_fqdn'] = datadump['nodename'] + '.' + datadump['autogen_domain']
     datadump_cache[item] = datadump.copy()
   except Exception:
@@ -757 +756 @@
   list_ileiden_proxies="
   {% for item in autogen_ileiden_proxies -%}
-    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.nodename }}
   {% endfor -%}
   "
   list_normal_proxies="
   {% for item in autogen_normal_proxies -%}
-    {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
+    {{ "%-16s"|format(item.masterip) }} # {{ item.nodename }}
   {% endfor -%}
   "
@@ -940 +939 @@
     hostdump = get_yaml(host)
     if hostdump['status'] == 'up' and (hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']):
-      nameservers_cache.append((hostdump['masterip'], hostdump['autogen_realname']))
+      nameservers_cache.append((hostdump['masterip'], hostdump['nodename']))
 
   return nameservers_cache[0:max_servers]
@@ -1027 +1026 @@
     hostdump = get_yaml(host)
     if hostdump['service_proxy_ileiden'] or hostdump['service_proxy_normal']:
-      datadump['autogen_ntp_servers'] += "server %(masterip)-15s iburst maxpoll 9 # %(autogen_realname)s\n" % hostdump
+      datadump['autogen_ntp_servers'] += "server %(masterip)-15s iburst maxpoll 9 # %(nodename)s\n" % hostdump
 
   return Template("""\
@@ -1329 +1328 @@
 
 
-def get_realname(datadump):
-  # Proxy naming convention is special, as the proxy name is also included in
-  # the nodename, when it comes to the numbered proxies.
-  if datadump['nodetype'] == 'Proxy':
-    realname = datadump['nodetype'] + datadump['nodename'].replace('proxy','')
-  else:
-    # By default the full name is listed and also a shortname CNAME for easy use.
-    realname = datadump['nodetype'] + datadump['nodename']
-  return(realname)
-
-
-
 def make_dns(output_dir = 'dns', external = False):
   items = dict()
@@ -1353 +1340 @@
 
     # Proxy naming convention is special
-    fqdn = datadump['autogen_realname']
+    fqdn = datadump['nodename']
     if datadump['nodetype'] in ['CNode', 'Hybrid']:
       wleiden_cname[datadump['nodename']] = fqdn
@@ -1981 +1968 @@
         datadump = { 'board' : 'UNKNOWN' }
         datadump.update(get_yaml(host))
-        datadumps[datadump['autogen_realname']] = datadump
+        datadumps[datadump['nodename']] = datadump
 
       (poel, errors) = make_relations()