Merge branch 'master' of git.rg.net:randy/Infrastructure

This commit is contained in:
Randy Bush 2017-11-16 09:48:27 +08:00
commit b0677bec5a

View file

@ -43,10 +43,13 @@ Equinix IX
RGnet
gige 1/05 vlan 50 r2.dfw.rg.net to GigE 0/1/0 NTT CONFLICT!!!!!!!
gige 1/06 r2.dfw.rg.net to GigE 0/1/1 RGnet LAN CONFLICT!!!!!!!
gige 1/07 r2.dfw.rg.net to GigE 0/1/2 Equinix IX
gige 1/08 r1.dfw ge-2/2/0 Local LAN
gige 1/11 r0.dfw.rg.net MgmtEth 0/0/CPU0/0
gige 1/12 r0.dfw.rg.net MgmtEth 0/1/CPU0/0
RGnet NFS
gige 1/13 dfw0.psg.com em0
@ -101,19 +104,18 @@ IETF Cluster
gige 1/31 vlan 200 b0.noc.ietf.org IPMI
gige 1/32 b0.noc.ietf.org LAN 10G twinAX
gige 1/33 ipmi.0.noc.ietf.org
gige 1/36 vm0.noc.ietf.org IPMI
gige 1/37 vm1.noc.ietf.org IPMI
gige 1/38 vm2.noc.ietf.org IPMI
gige 1/35 vm0.noc.ietf.org IPMI
gige 1/36 vm1.noc.ietf.org IPMI
gige 1/37 vm2.noc.ietf.org IPMI
gige 1/41 vlan 300 vm0.noc.ietf.org LAN 10G twinAX
gige 1/42 vlan 300 vm1.noc.ietf.org LAN 10G twinAX
gige 1/43 vlan 300 vm2.noc.ietf.org LAN 10G twinAX
gige 1/40 vlan 300 vm0.noc.ietf.org LAN 1G
gige 1/41 vlan 300 vm1.noc.ietf.org LAN 1G
gige 1/42 vlan 300 vm2.noc.ietf.org LAN 1G
gige 1/45 vlan 320 vm0.noc.ietf.org DRBD 10G twinAX
gige 1/46 vlan 320 vm1.noc.ietf.org DRBD 10G twinAX
gige 1/47 vlan 320 vm2.noc.ietf.org DRBD 10G twinAX
gige 1/44 vlan 320 vm0.noc.ietf.org DRBD 10G twinAX
gige 1/45 vlan 320 vm1.noc.ietf.org DRBD 10G twinAX
gige 1/46 vlan 320 vm2.noc.ietf.org DRBD 10G twinAX
CrossConnects