Fix syntax error, update some nodes
This commit is contained in:
parent
77f7380a12
commit
08fedd3a6e
|
@ -14,6 +14,7 @@ graph G {
|
||||||
label="place4: Germany";
|
label="place4: Germany";
|
||||||
server1p4 [ label="server1\ndns backup\nmx backup" ];
|
server1p4 [ label="server1\ndns backup\nmx backup" ];
|
||||||
}
|
}
|
||||||
|
|
||||||
subgraph cluster_place5 {
|
subgraph cluster_place5 {
|
||||||
label="place5: Schwanden";
|
label="place5: Schwanden";
|
||||||
server1p5 [ label="server1\nopennebula master\nceph osd" ];
|
server1p5 [ label="server1\nopennebula master\nceph osd" ];
|
||||||
|
@ -21,13 +22,11 @@ graph G {
|
||||||
server3p5 [ label="server3\nopennebula nodes\nceph osd" ];
|
server3p5 [ label="server3\nopennebula nodes\nceph osd" ];
|
||||||
server4p5 [ label="server4\nopennebula nodes\nceph osd" ];
|
server4p5 [ label="server4\nopennebula nodes\nceph osd" ];
|
||||||
|
|
||||||
router1p5 [ label="router1+2\nfirewall\nrouter\nnetboot" ];
|
router1p5 [ label="router1\nfirewall\nrouter\nnetboot" ];
|
||||||
router2p5 [ label="router1+2\nfirewall\nrouter\nnetboot" ];
|
router2p5 [ label="router2\nfirewall\nrouter\nnetboot" ];
|
||||||
|
|
||||||
mikrotikcrs1 [ label="switch1\ncopper" ];
|
apurouter1p5 [ label="dhcpv4\nnetboot\ncoworking" ];
|
||||||
mikrotikcrs2 [ label="switch2\ncopper" ];
|
apurouter2p5 [ label="dhcpv4\nnetboot\ncoworking" ];
|
||||||
|
|
||||||
apurouter2p5 [ label="dhcpv4\nnetboot\ncoworking ];
|
|
||||||
|
|
||||||
red1p5 [ label="red1\nceph monitor\nopennebula mysql" ];
|
red1p5 [ label="red1\nceph monitor\nopennebula mysql" ];
|
||||||
red2p5 [ label="red2\nceph monitor\n" ];
|
red2p5 [ label="red2\nceph monitor\n" ];
|
||||||
|
@ -35,20 +34,18 @@ graph G {
|
||||||
|
|
||||||
cephp5 [ label="ceph cluster" shape=oval ];
|
cephp5 [ label="ceph cluster" shape=oval ];
|
||||||
onep5 [ label="opennebula cluster" shape=oval ];
|
onep5 [ label="opennebula cluster" shape=oval ];
|
||||||
|
uplinkp5 [ label="Sunrise Uplink Device" ];
|
||||||
|
|
||||||
subgraph cluster_place5_switches {
|
|
||||||
label="Switches place5";
|
|
||||||
|
|
||||||
switch1p5 [ label="switch1"];
|
|
||||||
switch2p5 [ label="switch2"];
|
|
||||||
switch1p5--switch2p5 [ label="20G\nLACP\nMLAG" ];
|
|
||||||
}
|
|
||||||
{server1p5,server2p5,server3p5,server4p5,routersp5}--{switch1p5,switch2p5} [ label="20G\nLACP" ];
|
|
||||||
|
|
||||||
|
{server1p5,server2p5,server3p5,server4p5,router1p5,router2p5}--{switch1p5,switch2p5} [ label="20G\nLACP" ];
|
||||||
server1p5--{server1p5,server2p5,server3p5,server4p5} [ label="Manage VMs" ];
|
server1p5--{server1p5,server2p5,server3p5,server4p5} [ label="Manage VMs" ];
|
||||||
cephp5--{server1p5,server2p5,server3p5,server4p5,red1p5,red2p5,red3p5}
|
cephp5--{server1p5,server2p5,server3p5,server4p5,red1p5,red2p5,red3p5}
|
||||||
onep5--{server1p5,server2p5,server3p5,server4p5,red1p5} [ label="consists of" ];
|
onep5--{server1p5,server2p5,server3p5,server4p5,red1p5} [ label="consists of" ];
|
||||||
{server1p5,server2p5,server3p5,server4p5}--routersp5 [ label="Netboot" ];
|
{server1p5,server2p5,server3p5,server4p5}--{apurouter1p5,apurouter2p5} [ label="Netboot" ];
|
||||||
|
|
||||||
|
subgraph cluster_place5_ups {
|
||||||
|
label="UPS place5"
|
||||||
|
|
||||||
# This is the power connections
|
# This is the power connections
|
||||||
ups1 [ label="UPS1\n2200VA\n1320W" ]
|
ups1 [ label="UPS1\n2200VA\n1320W" ]
|
||||||
|
@ -57,25 +54,31 @@ graph G {
|
||||||
ups4 [ label="UPS4\n2200VA\n1320W" ]
|
ups4 [ label="UPS4\n2200VA\n1320W" ]
|
||||||
ups1small [ label="UPS1-Small\n1000VA\n550W" ]
|
ups1small [ label="UPS1-Small\n1000VA\n550W" ]
|
||||||
noorunknownups [ label="No or unknown UPS" ]
|
noorunknownups [ label="No or unknown UPS" ]
|
||||||
|
}
|
||||||
|
|
||||||
server1p5 -- ups1 [ label="Power connection 1100W" ]
|
server1p5 -- ups1 [ label="Power connection 1100W" ]
|
||||||
server2p5 -- ups3 [ label="Power connection 1100W" ]
|
server2p5 -- ups3 [ label="Power connection 1100W" ]
|
||||||
router1p5 -- ups5 [ label="Power connection 1100W" ]
|
router1p5 -- ups5 [ label="Power connection 1100W" ]
|
||||||
|
|
||||||
mdarrayserver2 -- ups2 [ label="Power connection 600W" ]
|
mdarrayserver2 -- ups2 [ label="Power connection 600W" ]
|
||||||
mdarrayserver3 -- ups4 [ label="Power connection 600W" ]
|
mdarrayserver3 -- ups4 [ label="Power connection 600W" ]
|
||||||
mdarrayserver4 -- ups5 [ label="Power connection 600W" ]
|
mdarrayserver4 -- ups5 [ label="Power connection 600W" ]
|
||||||
|
|
||||||
switch1p5 -- ups4 [ label="Power connection 460W" ]
|
switch1p5 -- ups4 [ label="Power connection 460W" ]
|
||||||
switch2p5 -- ups2 [ label="Power connection 460W" ]
|
switch2p5 -- ups2 [ label="Power connection 460W" ]
|
||||||
uplinkswitchp5 -- ups1small [ label="Power connection 350W" ]
|
|
||||||
|
uplinkp5 -- ups1small [ label="Power connection 350W" ]
|
||||||
|
|
||||||
red1p5 -- ups1small [ label="Power connection 24W" ]
|
red1p5 -- ups1small [ label="Power connection 24W" ]
|
||||||
red1p5 -- ups1small [ label="Power connection 24W" ]
|
red1p5 -- ups1small [ label="Power connection 24W" ]
|
||||||
red1p5 -- ups1small [ label="Power connection 24W" ]
|
red1p5 -- ups1small [ label="Power connection 24W" ]
|
||||||
|
|
||||||
mikrotikcrs1 -- ups1small [ label="Power connection 24W" ]
|
mikrotikcrs1 -- ups1small [ label="Power connection 24W" ]
|
||||||
mikrotikcrs2 -- ups1small [ label="Power connection 24W" ]
|
mikrotikcrs2 -- ups1small [ label="Power connection 24W" ]
|
||||||
apurouter2p5 -- ups1small [ label="Power connection 24W"]
|
apurouter2p5 -- ups1small [ label="Power connection 24W"]
|
||||||
|
|
||||||
|
|
||||||
{server3p5,server4p5,router2p5,} -- noorunknownups [ label="???" ]
|
{server3p5,server4p5,router2p5,apurouter1p5} -- noorunknownups [ label="???" ]
|
||||||
|
|
||||||
# MDarray section
|
# MDarray section
|
||||||
mdarrayserver2 [ label="MDArray (server2)" ]
|
mdarrayserver2 [ label="MDArray (server2)" ]
|
||||||
|
@ -84,6 +87,17 @@ graph G {
|
||||||
server2p5 -- mdarrayserver2 [ label="via SAS" ]
|
server2p5 -- mdarrayserver2 [ label="via SAS" ]
|
||||||
server3p5 -- mdarrayserver3 [ label="via SAS" ]
|
server3p5 -- mdarrayserver3 [ label="via SAS" ]
|
||||||
server4p5 -- mdarrayserver4 [ label="via SAS" ]
|
server4p5 -- mdarrayserver4 [ label="via SAS" ]
|
||||||
|
|
||||||
|
subgraph cluster_place5_switches {
|
||||||
|
label="Switches place5";
|
||||||
|
|
||||||
|
switch1p5 [ label="switch1"];
|
||||||
|
switch2p5 [ label="switch2"];
|
||||||
|
mikrotikcrs1 [ label="CRS326-1" ];
|
||||||
|
mikrotikcrs2 [ label="CRS326-2" ];
|
||||||
|
switch1p5--switch2p5 [ label="20G\nLACP\nMLAG" ];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
subgraph cluster_place6 {
|
subgraph cluster_place6 {
|
||||||
|
@ -169,9 +183,10 @@ graph G {
|
||||||
switch3p6--switch1p8 [ label="Dark fiber" ];
|
switch3p6--switch1p8 [ label="Dark fiber" ];
|
||||||
switch1p10--switch3p6 [ label="Dark fiber"];
|
switch1p10--switch3p6 [ label="Dark fiber"];
|
||||||
|
|
||||||
server1p11--{routersp5,router1p6,router2p6} [ label="Place11 monitors" ];
|
server1p11--{router1p5,router2p5,router1p6,router2p6} [ label="Place11 monitors" ];
|
||||||
server1p4--hetzner [ label="Default Route" ];
|
server1p4--hetzner [ label="Default Route" ];
|
||||||
routersp5--sunrise [ label="BGP Peering" ];
|
{router1p5,router2p5}--sunrise [ label="BGP Peering" ];
|
||||||
|
uplinkp5--sunrise [ label="Fiber" ];
|
||||||
{router1p6,router2p6}--netstream [ label="BGP Peering" ];
|
{router1p6,router2p6}--netstream [ label="BGP Peering" ];
|
||||||
redp7--saltlte;
|
redp7--saltlte;
|
||||||
server1p11--mythicbeasts [ label="Default Route" ];
|
server1p11--mythicbeasts [ label="Default Route" ];
|
||||||
|
|
Loading…
Reference in New Issue