Changeset 10321 in genesis

Timestamp:

Apr 1, 2012, 8:14:56 PM (13 years ago)

Author:

rick

Message:

Whitespace and duplicate externalif entries.

Location:

nodes

Files:

• CNodeBoterhuis/wleiden.yaml (modified) (7 diffs)
• CNodeKaag2/wleiden.yaml (modified) (2 diffs)
• CNodeUniGor1/wleiden.yaml (modified) (2 diffs)
• CNodeUniGor2/wleiden.yaml (modified) (3 diffs)
• CNodeUniGorN/wleiden.yaml (modified) (3 diffs)
• hybrid8/wleiden.yaml (modified) (1 diff)
• proxy1/wleiden.yaml (modified) (2 diffs)
• proxy10/wleiden.yaml (modified) (2 diffs)
• proxy11/wleiden.yaml (modified) (2 diffs)
• proxy12/wleiden.yaml (modified) (2 diffs)
• proxy13/wleiden.yaml (modified) (2 diffs)
• proxy14/wleiden.yaml (modified) (2 diffs)
• proxy15/wleiden.yaml (modified) (1 diff)
• proxy16/wleiden.yaml (modified) (2 diffs)
• proxy17/wleiden.yaml (modified) (2 diffs)
• proxy18/wleiden.yaml (modified) (2 diffs)
• proxy19/wleiden.yaml (modified) (2 diffs)
• proxy2/wleiden.yaml (modified) (2 diffs)
• proxy20/wleiden.yaml (modified) (2 diffs)
• proxy3/wleiden.yaml (modified) (2 diffs)
• proxy4/wleiden.yaml (modified) (2 diffs)
• proxy5/wleiden.yaml (modified) (2 diffs)
• proxy6/wleiden.yaml (modified) (2 diffs)
• proxy62/wleiden.yaml (modified) (2 diffs)
• proxy7/wleiden.yaml (modified) (2 diffs)
• proxy8/wleiden.yaml (modified) (1 diff)
• proxy9/wleiden.yaml (modified) (2 diffs)
• proxy97/wleiden.yaml (modified) (2 diffs)

nodes/CNodeBoterhuis/wleiden.yaml

@@ -5 +5 @@
 ileiden   : True
 interfaces: "ue0,ath0,vr0,vr1,vr2"
-latitude  : ""
+latitude  : "4.52255"
 location  : "Zeeverkennerscentrum Kagerplassen, Boterhuiseiland"
-longitude : ""
+longitude : "52.18753"
 masterip  : "172.17.31.1"
 nodename  : "Boterhuis"
@@ -15 +15 @@
 release   : "9.0-RELEASE"
 status    : "down"
+
 
 iface_ath0:
@@ -30 +31 @@
   status     : "down"
 
+
 iface_ue0:
   comment    : "ap2"
@@ -42 +44 @@
   ssid       : "ap2-WirelessLeiden-Boterhuis"
   dhcp       : "10-100"
+  bullet2_ip : "172.17.31.2/24"
+  bullet2_mac: "00:27:22:2C:4C:88"
   compass    : "-"
   height     : "8"
-  bullet2_ip : "172.17.31.2/24"
-  bullet2_mac: "00:27:22:2C:4C:88"
   status     : "down"
+
 
 iface_ue1:
@@ -66 +69 @@
   status     : "down"
 
+
 iface_vr0:
   comment    : "link to Graficall"
@@ -83 +87 @@
   status     : "up"
 
+
 iface_vr1:
   interface  : "vr1"
@@ -98 +103 @@
   ns_mac     : "00:27:22:8A:3D:B6"
   status     : "up"
+
 
 iface_vr2:

nodes/CNodeKaag2/wleiden.yaml

@@ -67 +67 @@
   status     : "up"
 
+
 iface_vr1_alias0:
   comment    : "link naar Boterhuis"
@@ -80 +81 @@
   compass    : "s"
   status     : "down"
+
 
 iface_vr2:

nodes/CNodeUniGor1/wleiden.yaml

@@ -43 +43 @@
   status     : "up"
 
+
 iface_vr0_alias0:
   comment    : "Ethernet"
@@ -53 +54 @@
   compass    : "None"
   status     : "up"
+
 
 iface_vr0_alias1:

nodes/CNodeUniGor2/wleiden.yaml

@@ -43 +43 @@
   status     : "up"
 
+
 iface_vr0_alias0:
   comment    : "Ethernet"
@@ -54 +55 @@
   status     : "up"
 
+
 iface_vr0_alias1:
   comment    : "Ethernet"
@@ -64 +66 @@
   compass    : "None"
   status     : "up"
+
 
 iface_vr1:

nodes/CNodeUniGorN/wleiden.yaml

@@ -131 +131 @@
   status     : "up"
 
+
 iface_vr2_alias0:
   comment    : "Ethernet"
@@ -141 +142 @@
   compass    : "None"
   status     : "up"
+
 
 iface_vr2_alias1:
@@ -153 +155 @@
   status     : "up"
 
+

nodes/hybrid8/wleiden.yaml

@@ -3 +3 @@
 #
 comment   : "Test voor hybrid"
+externalif: "sis0"
 gateway   : "192.168.84.1"
 ileiden   : True
 interfaces: "sis0"
 internalif: "tap0"
-externalif: "sis0"
 latitude  : "5.13854"
 location  : " Richard, Terschelling 244, 3524az Utrecht"

nodes/proxy1/wleiden.yaml

@@ -9 +9 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.17.8.66"
 latitude  : "4.48521"
@@ -16 +15 @@
 masterip  : "172.17.8.68"
 nat       : False
-nodename  : "Proxy1"
+nodename  : "proxy1"
 nodetype  : "Proxy"
 proxyid   : 1

nodes/proxy10/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis0"
-externalif: "sis1"
 internalroute: "172.22.0.65"
 latitude  : "4.44820"
@@ -14 +13 @@
 longitude : "52.15367"
 masterip  : "172.22.0.66"
-nodename  : "Proxy10"
+nodename  : "proxy10"
 nodetype  : "Proxy"
 proxyid   : 10

nodes/proxy11/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis0"
-externalif: "sis1"
 internalroute: "172.23.25.65"
 latitude  : "4.47727"
@@ -14 +13 @@
 longitude : "52.18621"
 masterip  : "172.23.25.66"
-nodename  : "Proxy11"
+nodename  : "proxy11"
 nodetype  : "Proxy"
 proxyid   : 11

nodes/proxy12/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.25.90.65"
 latitude  : "4.75742"
@@ -15 +14 @@
 masterip  : "172.25.90.66"
 nat       : True
-nodename  : "Proxy12"
+nodename  : "proxy12"
 nodetype  : "Proxy"
 proxyid   : 12

nodes/proxy13/wleiden.yaml

@@ -8 +8 @@
 interfaces: "vr0,vr1"
 internalif: "vr1"
-externalif: "vr0"
 internalroute: "172.16.3.97"
 latitude  : "4.47100"
@@ -15 +14 @@
 masterip  : "172.16.3.98"
 nat       : True
-nodename  : "Proxy13"
+nodename  : "proxy13"
 nodetype  : "Proxy"
 proxyid   : 13

nodes/proxy14/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.25.90.69"
 latitude  : "4.75742"
@@ -15 +14 @@
 masterip  : "172.25.90.69"
 nat       : True
-nodename  : "Proxy14"
+nodename  : "proxy14"
 nodetype  : "Proxy"
 proxyid   : 14

nodes/proxy15/wleiden.yaml

@@ -13 +13 @@
 masterip  : "172.27.129.67"
 nat       : True
-nodename  : "Proxy15"
+nodename  : "proxy15"
 nodetype  : "Proxy"
 proxyid   : 15

nodes/proxy16/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.18.17"
 latitude  : "4.53709"
@@ -14 +13 @@
 longitude : "52.19745"
 masterip  : "172.16.18.18"
-nodename  : "Proxy16"
+nodename  : "proxy16"
 nodetype  : "Proxy"
 proxyid   : 16

nodes/proxy17/wleiden.yaml

@@ -8 +8 @@
 interfaces: "vr0,vr1"
 internalif: "vr1"
-externalif: "vr0"
 internalroute: "172.17.0.33"
 latitude  : "4.75732"
@@ -15 +14 @@
 masterip  : "172.17.0.36"
 nat       : True
-nodename  : "Proxy17"
+nodename  : "proxy17"
 nodetype  : "Proxy"
 proxyid   : 17

nodes/proxy18/wleiden.yaml

@@ -7 +7 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.18.33"
 latitude  : "4.63854"
@@ -14 +13 @@
 masterip  : "172.16.18.38"
 nat       : False
-nodename  : "Proxy18"
+nodename  : "proxy18"
 nodetype  : "Proxy"
 proxyid   : 18

nodes/proxy19/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.5.105"
 latitude  : "4.51566"
@@ -14 +13 @@
 longitude : "52.14282"
 masterip  : "172.17.28.1"
-nodename  : "Proxy19"
+nodename  : "proxy19"
 nodetype  : "Proxy"
 proxyid   : 19

nodes/proxy2/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1,sis2"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.17.143.2"
 latitude  : "4.49421"
@@ -14 +13 @@
 longitude : "52.15812"
 masterip  : "172.17.143.4"
-nodename  : "Proxy2"
+nodename  : "proxy2"
 nodetype  : "Proxy"
 proxyid   : 2

nodes/proxy20/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.4.137"
 latitude  : "4.47694"
@@ -14 +13 @@
 longitude : "52.17305"
 masterip  : "172.16.4.138"
-nodename  : "Proxy20"
+nodename  : "proxy20"
 nodetype  : "Proxy"
 proxyid   : 20

nodes/proxy3/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.20.128.97"
 latitude  : "4.47320"
@@ -14 +13 @@
 longitude : "52.15001"
 masterip  : "172.20.128.98"
-nodename  : "Proxy3"
+nodename  : "proxy3"
 nodetype  : "Proxy"
 proxyid   : 3

nodes/proxy4/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.2.253"
 latitude  : "4.46733"
@@ -14 +13 @@
 longitude : "52.14490"
 masterip  : "172.16.2.254"
-nodename  : "Proxy4"
+nodename  : "proxy4"
 nodetype  : "Proxy"
 proxyid   : 4

nodes/proxy5/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.19.168.65"
 latitude  : "4.47978"
@@ -14 +13 @@
 longitude : "52.17294"
 masterip  : "172.19.168.66"
-nodename  : "Proxy5"
+nodename  : "proxy5"
 nodetype  : "Proxy"
 proxyid   : 5

nodes/proxy6/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.3.145"
 latitude  : "4.47107"
@@ -14 +13 @@
 longitude : "52.16352"
 masterip  : "172.16.3.146"
-nodename  : "Proxy6"
+nodename  : "proxy6"
 nodetype  : "Proxy"
 proxyid   : 6

nodes/proxy62/wleiden.yaml

@@ -9 +9 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.17.16.65"
 latitude  : "4.48626"
@@ -16 +15 @@
 masterip  : "172.17.16.66"
 nat       : False
-nodename  : "Proxy62"
+nodename  : "proxy62"
 nodetype  : "Proxy"
 proxyid   : 62

nodes/proxy7/wleiden.yaml

@@ -3 +3 @@
 #
 comment   : " verbonden met 'vuil' internet van Zorggroep Rijnland lokaal ip en nameservers via dhcp LET OP: niet standaard configuratie ivm lokale ap's!"
+externalif: "vr0"
 gateway   : "192.168.200.1"
 ileiden   : True
 interfaces: "vr0,vr1"
 internalif: "vr1"
-externalif: "vr0"
 internalroute: "172.17.0.2"
 latitude  : "4.53567"
@@ -13 +13 @@
 longitude : "52.15576"
 masterip  : "172.17.0.1"
-nodename  : "Proxy7"
+nodename  : "proxy7"
 nodetype  : "Proxy"
 proxyid   : 7

nodes/proxy8/wleiden.yaml

@@ -14 +14 @@
 masterip  : "172.17.65.1"
 nat       : True
-nodename  : "Proxy8"
+nodename  : "proxy8"
 nodetype  : "Proxy"
 proxyid   : 8

nodes/proxy9/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.16.4.53"
 latitude  : "4.52066"
@@ -14 +13 @@
 longitude : "52.15060"
 masterip  : "172.16.4.54"
-nodename  : "Proxy9"
+nodename  : "proxy9"
 nodetype  : "Proxy"
 proxyid   : 9

nodes/proxy97/wleiden.yaml

@@ -8 +8 @@
 interfaces: "sis0,sis1"
 internalif: "sis1"
-externalif: "sis0"
 internalroute: "172.17.169.65"
 latitude  : "4.49646"
@@ -14 +13 @@
 longitude : "52.15395"
 masterip  : "172.17.169.66"
-nodename  : "Proxy97"
+nodename  : "proxy97"
 nodetype  : "Proxy"
 proxyid   : 97