diff --git a/data/grid5000/sites/nancy/nancy.json b/data/grid5000/sites/nancy/nancy.json index bf743e38865a21359083cc2258f8d8f82a1895d7..7b3a8fcde7baae51a90ebbd003146b463531e32e 100644 --- a/data/grid5000/sites/nancy/nancy.json +++ b/data/grid5000/sites/nancy/nancy.json @@ -62,7 +62,7 @@ "production": true, "renater_ip": "192.168.4.14", "security_contact": "support-staff@lists.grid5000.fr", - "storage5k": true, + "storage5k": false, "sys_admin_contact": "support-staff@lists.grid5000.fr", "type": "site", "uid": "nancy", diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json index ebc1c75b58d6a1a5765922d3766f82696ee4fcd1..d661fbc7cb04364afbce0782c6816a87eb2426e7 100644 --- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json +++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json @@ -222,8 +222,6 @@ { }, { - "kind": "switch", - "uid": "sgravillon1" }, { "kind": "virtual", diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json deleted file mode 100644 index af4895b8d940e58d8b32b73eb85b1af27dbcd8c5..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "backplane_bps": 346000000000, - "kind": "switch", - "linecards": [ - { - }, - { - "backplane_bps": 14400000000, - "kavlan_pattern": "A%PORT%", - "kind": "other", - "model": "J8702A", - "ports": [ - { - }, - { - }, - { - }, - { - "kind": "virtual", - "uid": "TALC-ADM" - }, - { - }, - { - }, - { - }, - { - "kind": "other", - "port": "bmc", - "uid": "fgriffon2" - }, - { - }, - { - }, - { - "kind": "other", - "port": "bmc", - "uid": "fgriffon1" - }, - { - "kind": "other", - "port": "eth0", - "uid": "fgriffon1" - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - }, - { - "kind": "other", - "port": "eth1", - "uid": "fgriffon1" - } - ], - "rate": 1000000000, - "snmp_pattern": "A%PORT%" - }, - { - }, - { - }, - { - "backplane_bps": 14400000000, - "kavlan_pattern": "D%PORT%", - "kind": "other", - "model": "J8708A", - "ports": [ - { - }, - { - "kind": "other", - "port": "eth2", - "uid": "fgriffon1" - }, - { - "kind": "other", - "port": "eth2", - "uid": "fgriffon2" - } - ], - "rate": 10000000000, - "snmp_pattern": "D%PORT%" - }, - { - }, - { - "backplane_bps": 14400000000, - "kavlan_pattern": "F%PORT%", - "kind": "router", - "model": "J9538A", - "ports": [ - { - }, - { - "kind": "router", - "uid": "gw-nancy" - } - ], - "rate": 10000000000, - "snmp_pattern": "F%PORT%" - } - ], - "model": "HP Procurve 5406zl J8697A", - "sensors": { - "network": { - "available": true, - "resolution": 1 - } - }, - "site": "nancy", - "snmp_community": "public", - "type": "network_equipment", - "uid": "sgravillon1", - "warranty": "2012-03-01", - "weathermap": { - } -} \ No newline at end of file diff --git a/data/grid5000/sites/nancy/servers/fgriffon2.json b/data/grid5000/sites/nancy/servers/fgriffon2.json deleted file mode 100644 index afe4e0c2cfffc1c9f3543ce282fd00f0218a1412..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nancy/servers/fgriffon2.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "alias": [ - "storage5k" - ], - "kind": "physical", - "monitoring": { - "metric": "power", - "wattmeter": "multiple" - }, - "network_adapters": { - "adm": { - "ip": "172.17.79.2", - "mac": "00:E0:81:B5:8F:BA", - "mounted": true - }, - "bmc": { - "ip": "172.17.79.5", - "mac": "00:E0:81:4F:E3:63", - "mounted": true - }, - "default": { - "ip": "172.16.79.2", - "mac": "00:02:C9:02:41:66", - "mounted": true - } - }, - "sensors": { - "network": { - "available": true, - "resolution": 1 - } - }, - "serial": null, - "type": "server", - "uid": "fgriffon2", - "warranty": "2012-01" -} \ No newline at end of file diff --git a/data/grid5000/sites/nancy/servers/opensm.json b/data/grid5000/sites/nancy/servers/opensm.json deleted file mode 100644 index 6572bd905f4ca6c9dc20e1b4e7a3491be3ef3eee..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/nancy/servers/opensm.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "alias": [ - - ], - "kind": "physical", - "network_adapters": { - "bmc": { - "ip": "172.17.79.24", - "mac": "00:E0:81:D5:08:0F" - }, - "default": { - "ip": "172.16.79.24", - "mac": "00:E0:81:D5:08:0C" - } - }, - "serial": 1009390098, - "type": "server", - "uid": "opensm", - "warranty": "2013-01" -} \ No newline at end of file