Changeset 10885 in genesis for nodes/CNodeStadhuis/wleiden.yaml

Timestamp:

May 16, 2012, 8:56:46 PM (13 years ago)

Author:

rick

Message:

Handmatig(!) opruimen van alle conflict keys.

Related-To: ​nodefactory:ticket:218

File:

• nodes/CNodeStadhuis/wleiden.yaml (modified) (14 diffs)

nodes/CNodeStadhuis/wleiden.yaml

@@ -21 +21 @@
   interface  : "sis0"
   ip         : "172.17.29.1/24"
-  desc       : "ethernet"
   sdesc      : "2APzuid"
   type       : "eth"
@@ -34 +33 @@
   interface  : "sis0:0"
   ip         : "172.16.3.241/30"
-  desc       : "ethernet"
   sdesc      : "manageB2"
   mode       : "ap-wds"
@@ -47 +45 @@
 
 iface_sis1:
-  comment    : "A-link west via Nanostation5"
+  comment    : "Ethernet to interlink west (Vosko3)"
   interface  : "sis1"
   ip         : "172.16.5.68/29"
-  desc       : "Ethernet to interlink west (Vosko3)"
   sdesc      : "2Vosko3"
   mode       : "station-wds"
@@ -69 +66 @@
   interface  : "sis2"
   ip         : "172.17.30.1/24"
-  desc       : "ethernet"
   sdesc      : "2APwest"
   type       : "eth"
@@ -82 +78 @@
   interface  : "sis2:0"
   ip         : "172.16.3.205/30"
-  desc       : "ethernet"
   sdesc      : "manageB2"
   mode       : "ap-wds"
@@ -95 +90 @@
 
 iface_sis3:
-  comment    : "A-link north-west via Nanostation5"
+  comment    : "Ethernet to interlink north-west (Cope)"
   interface  : "sis3"
   ip         : "172.16.3.177/29"
-  desc       : "Ethernet to interlink north-west (Cope)"
   sdesc      : "2cope"
   mode       : "station-wds"
@@ -114 +108 @@
 
 iface_sis3_alias0:
-  comment    : "Extra a-link to LucasN"
+  comment    : "Ethernet to interlink north-west (LucasN)"
   interface  : "sis3:0"
   ip         : "172.16.4.129/29"
-  desc       : "Ethernet to interlink north-west (LucasN)"
   sdesc      : "2LucasN"
   type       : "eth"
@@ -127 +120 @@
 
 iface_sis3_alias1:
-  comment    : "Extra a-link to DirkLos2"
+  comment    : "Ethernet to interlink north-west (DirkLos2)"
   interface  : "sis3:1"
   ip         : "172.16.3.73/29"
-  desc       : "Ethernet to interlink north-west (DirkLos2)"
   sdesc      : "2DirkLos2"
   type       : "eth"
@@ -143 +135 @@
   interface  : "ue0"
   ip         : "172.17.141.1/26"
-  desc       : "lokaal ap"
   sdesc      : "internap"
   mode       : "station-wds"
@@ -161 +152 @@
   interface  : "vr0"
   ip         : "172.16.3.172/29"
-  desc       : "ethernet"
   sdesc      : "2SOM1"
   mode       : "station-wds"
@@ -180 +170 @@
   interface  : "vr1"
   ip         : "172.17.25.1/24"
-  desc       : "Ethernet to AP north"
   sdesc      : "2AP-north"
   type       : "eth"
@@ -208 +197 @@
   interface  : "vr2"
   ip         : "172.16.3.209/29"
-  desc       : "ethernet"
   sdesc      : "2DeClercq"
   mode       : "station-wds"
@@ -223 +211 @@
 
 iface_vr3:
-  comment    : "A-link south-east via nanostation"
+  comment    : "Ethernet to interlink south east (Plantsoen)"
   interface  : "vr3"
   ip         : "172.16.5.113/29"
-  desc       : "Ethernet to interlink south east (Plantsoen)"
   sdesc      : "2Plantsoen"
   mode       : "station-wds"
@@ -242 +229 @@
 
 iface_vr3_alias0:
-  comment    : "Ethernet"
+  comment    : "interlink naar victoria"
   interface  : "vr3:0"
   ip         : "172.16.17.193/29"
-  desc       : "interlink naar victoria"
   sdesc      : "2victoria"
   type       : "eth"