++ recable for place6

This commit is contained in:
Nico Schottelius 2020-06-30 22:04:12 +02:00
parent 77d808dcbd
commit 5e9bcfb670
1 changed files with 98 additions and 14 deletions

View File

@ -41,7 +41,7 @@ graph G {
switch1p5 [ label="switch1"];
switch2p5 [ label="switch2"];
switch1p5--switch2p5 [ label="20G\nLACP\nMLAG" ];
{server1p5,server2p5,server3p5,server4p5,router1p5,router2p5}--{switch1p5,switch2p5} [ label="20G\nLACP" ];
{server1p5,server2p5,server3p5,server4p5,router1p5,router2p5}--{switch1p5,switch2p5} [ label="20G\nLACP" ];
@ -79,17 +79,17 @@ graph G {
uplinkswitchp5 -- 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" ]
red2p5 -- ups7 [ label="Power connection 24W" ]
mikrotikcrs3261 -- ups1small [ label="Power connection 24W" ]
mikrotikcrs3262 -- ups1small [ label="Power connection 24W" ]
apurouter1p5 -- ups7 [ label="Power connection 24W"]
apurouter2p5 -- ups1small [ label="Power connection 24W"]
router2p5 -- noorunknownups [ label="???" ]
# MDarray section
@ -128,7 +128,6 @@ graph G {
switch1p6--switch2p6 [ label="20G\nLACP\nMLAG" ];
serversnorthp6 [ label="servers\nopennebula nodes\nceph osd" ];
serversnorthp6--{switch1p6,switch2p6} [ label="20G\nLACP" ];
router2p6 [ label="router2\nfirewall\nrouter\nnetboot" ];
{router2p6,serversnorthp6}--{switch1p6,switch2p6} [ label="20G\nLACP" ];
}
@ -142,18 +141,103 @@ graph G {
subgraph cluster_place6_east {
label="place6: East (Production)";
router1p6 [ label="router1\nfirewall\nrouter\nnetboot" ];
replacementroutersp6 [ label="replacement-router1+2\nnext gen routing" ];
subgraph cluster_place6_east_shelf7 {
label="Shelf 7"
serverseastp6 [ label="servers\nopennebula nodes\nceph osd" ];
serverseastp6--{switch1p6,switch2p6} [ label="20G\nLACP" ];
server4p6 [ label="server4.place6" ]
mdarrayserver4p6 [ label="MDArray server4.place6" ]
server4p6 -- mdarrayserver4p6 [ label="SAS" ]
switch5p6 [ label="switch5"];
switch6p6 [ label="switch6"];
switch5p6--switch6p6 [ label="20G\nLACP\nMLAG" ];
ciara1 [ label="ciara1" ]; # 770W
router2p6 [ label="router2.place6" ]
serversnorthp6 [ label="servers\nopennebula nodes\nceph osd" ];
{router1p6,serverseastp6,replacementroutersp6}--{switch5p6,switch6p6} [ label="20G\nLACP" ];
ups10 [ label="UPS10 (1400W / 2200VA)" ]
ups11 [ label="UPS11 (1400W / 2200VA)" ]
router2p6 -- ups1p6 [ label="570W" ]
mdarrayserver4p6 -- ups1p6 [ label="600W" ]
server4p6 -- ups11 [ label="1100W" ]
ciara1 -- ups10 [ label="770W" ]
}
subgraph cluster_place6_east_shelf6 {
label="Shelf 6"
randomr710
overdrive1
overdrive2
server17p6 [ label="server17.place6" ]
mdarrayserver17p6 [ label="MDArray server17.place6" ]
ups12 [ label="UPS12 (1400W / 2200VA)" ]
server17p6 -- ups12 [ label="870W" ]
server17p6 -- mdarrayserver17p6 [ label="SAS" ]
mdarrayserver17p6 -- ups10 [ label="600W" ]
}
subgraph cluster_place6_east_shelf5 {
label="Shelf 5"
ciara3 [ label="ciara3.place6" ];
server15p6 [ label="server15.place6" ]
mdarrayserver15p6 [ label="MDArray server15.place6" ]
ups13 [ label="UPS12 (1400W / 2200VA)" ]
server15p6 -- ups13 [ label="570W" ]
mdarrayserver15p6 -- ups13 [ label="600W" ]
server15p6 -- mdarrayserver15p6 [ label="SAS" ]
}
subgraph cluster_place6_east_shelf4 {
label="Shelf 4"
server11p6 [ label="server11.place6" ]
server12p6 [ label="server12.place6" ]
server3p6 [ label="server3.place6" ]
mdarrayserver3p6 [ label="MDArray server3.place6" ]
server3p6 -- mdarrayserver3p6 [ label="SAS" ]
}
subgraph cluster_place6_east_shelf3 {
label="Shelf 3"
server9p6 [ label="server9.place6" ]
server10p6 [ label="server10.place6" ]
server2p6 [ label="server2.place6" ]
mdarrayserver2p6 [ label="MDArray server2.place6" ]
server2p6 -- mdarrayserver2p6 [ label="SAS" ]
}
subgraph cluster_place6_east_shelf2 {
label="Shelf 2"
router1p6 [ label="router1.place6" ]
ups3p6 [ label="UPS3 1320W" ]
router1p6 -- ups3p6 [ label="Unknown" ]
}
subgraph cluster_place6_east_shelf1 {
label="Shelf 1"
switch5p6 [ label="switch5"];
switch6p6 [ label="switch6"];
switch5p6--switch6p6 [ label="20G\nLACP\nMLAG" ];
black3
apurouter1p6
server6p6 [ label="server6.place6" ]
mdarrayserver6p6 [ label="MDArray server6.place6" ]
server6p6 -- mdarrayserver6p6 [ label="SAS" ]
}
# serversnorthp6 [ label="servers\nopennebula nodes\nceph osd" ];
# {router1p6,serverseastp6,replacementroutersp6}--{switch5p6,switch6p6} [ label="20G\nLACP" ];
}
subgraph cluster_place6_west {