diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json b/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json deleted file mode 100644 index 8c22d45176d4e95c8410fcbede9f7fbfbfdf7a1d..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/network_equipments/gw-strasbourg.json +++ /dev/null @@ -1,305 +0,0 @@ -{ - "ip": "172.17.175.254", - "ip6": "2001:660:4406:a00::ffff:ffff", - "kind": "router", - "linecards": [ - { - }, - { - "kavlan_pattern": "%PORT%", - "kind": "node", - "ports": [ - { - "kind": "node", - "port": "data", - "snmp_name": "Ethernet0", - "uid": "srv" - }, - { - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet2", - "uid": "pve-1" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet3", - "uid": "pve-2" - }, - { - }, - { - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet6", - "uid": "fleckenstein-1" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet7", - "uid": "fleckenstein-1" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet8", - "uid": "fleckenstein-1" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet9", - "uid": "fleckenstein-2" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet10", - "uid": "fleckenstein-2" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet11", - "uid": "fleckenstein-2" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet12", - "uid": "fleckenstein-3" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet13", - "uid": "fleckenstein-3" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet14", - "uid": "fleckenstein-3" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet15", - "uid": "fleckenstein-4" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet16", - "uid": "fleckenstein-4" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet17", - "uid": "fleckenstein-4" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet18", - "uid": "fleckenstein-5" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet19", - "uid": "fleckenstein-5" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet20", - "uid": "fleckenstein-5" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet21", - "uid": "fleckenstein-6" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet22", - "uid": "fleckenstein-6" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet23", - "uid": "fleckenstein-6" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet24", - "uid": "fleckenstein-7" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet25", - "uid": "fleckenstein-7" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet26", - "uid": "fleckenstein-7" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet27", - "uid": "fleckenstein-8" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet28", - "uid": "fleckenstein-8" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet29", - "uid": "fleckenstein-8" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet30", - "uid": "fleckenstein-9" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet31", - "uid": "fleckenstein-9" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet32", - "uid": "fleckenstein-9" - }, - { - "kind": "node", - "port": "eth0", - "snmp_name": "Ethernet33", - "uid": "fleckenstein-10" - }, - { - "kind": "node", - "port": "eth1", - "snmp_name": "Ethernet34", - "uid": "fleckenstein-10" - }, - { - "kind": "node", - "port": "eth2", - "snmp_name": "Ethernet35", - "uid": "fleckenstein-10" - } - ], - "rate": 25000000000, - "snmp_pattern": "Ethernet%PORT%" - } - ], - "model": "wedge100bf_32x", - "serial": "AM26029251", - "site": "strasbourg", - "snmp_community": "Unknown", - "type": "network_equipment", - "uid": "gw-strasbourg", - "vlans": { - "vlan100": { - "addresses": [ - "172.16.175.254" - ], - "administrative": true - }, - "vlan101": { - "addresses": [ - "172.17.175.254" - ] - }, - "vlan500": { - "addresses": [ - "192.168.4.23" - ] - }, - "vlan701": { - "addresses": [ - "192.168.192.0/20" - ], - "name": "kavlan-1" - }, - "vlan702": { - "addresses": [ - "192.168.208.0/20" - ], - "name": "kavlan-2" - }, - "vlan703": { - "addresses": [ - "192.168.224.0/20" - ], - "name": "kavlan-3" - }, - "vlan704": { - "addresses": [ - "10.36.0.0/18" - ], - "name": "kavlan-4" - }, - "vlan705": { - "addresses": [ - "10.36.64.0/18" - ], - "name": "kavlan-5" - }, - "vlan706": { - "addresses": [ - "10.36.128.0/18" - ], - "name": "kavlan-6" - }, - "vlan707": { - "addresses": [ - "10.36.192.0/18" - ], - "name": "kavlan-7" - }, - "vlan708": { - "addresses": [ - "10.37.0.0/18" - ], - "name": "kavlan-8" - }, - "vlan709": { - "addresses": [ - "10.37.64.0/18" - ], - "name": "kavlan-9" - }, - "vlan719": { - "addresses": [ - "10.39.192.0/18" - ], - "name": "kavlan-19" - } - } -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/api-proxy.json b/data/grid5000/sites/strasbourg/servers/api-proxy.json deleted file mode 100644 index 0c749f6b39a17096a57866b08cf528e152bd1c91..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/api-proxy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.115" - } - }, - "type": "server", - "uid": "api-proxy" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/api-server-devel.json b/data/grid5000/sites/strasbourg/servers/api-server-devel.json deleted file mode 100644 index 324b242ffc79d992496c836ba76b34e510bde5c1..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/api-server-devel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.114" - } - }, - "type": "server", - "uid": "api-server-devel" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/api-server-v3.json b/data/grid5000/sites/strasbourg/servers/api-server-v3.json deleted file mode 100644 index b38fbfe66c80ae6563e34e348b9290d5d3084f6c..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/api-server-v3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.112" - } - }, - "type": "server", - "uid": "api-server-v3" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/conman.json b/data/grid5000/sites/strasbourg/servers/conman.json deleted file mode 100644 index cc735a35fefbb5a962a85aa0f7f90f27ef89c24c..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/conman.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.113" - } - }, - "type": "server", - "uid": "conman" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/dhcp.json b/data/grid5000/sites/strasbourg/servers/dhcp.json deleted file mode 100644 index 177cddd6dd2c29d1178f3fa1963749e511018171..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/dhcp.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.109" - } - }, - "type": "server", - "uid": "dhcp" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/dns.json b/data/grid5000/sites/strasbourg/servers/dns.json deleted file mode 100644 index aacea6b6621135f2809ba6941f5b2d9c6aede049..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/dns.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.107" - } - }, - "type": "server", - "uid": "dns" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/fstrasbourg.json b/data/grid5000/sites/strasbourg/servers/fstrasbourg.json deleted file mode 100644 index dd62bc07c1e11429b3645544de455eab50987e06..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/fstrasbourg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "alias": [ - "oar-api", - "frontend" - ], - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.110" - } - }, - "type": "server", - "uid": "fstrasbourg" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/guix.json b/data/grid5000/sites/strasbourg/servers/guix.json deleted file mode 100644 index 3ef05d858f5c21ba11a8e7e0bea7f14c80d5ac9c..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/guix.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.123" - } - }, - "type": "server", - "uid": "guix" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kadeploy-devel.json b/data/grid5000/sites/strasbourg/servers/kadeploy-devel.json deleted file mode 100644 index eae5d89c70f74383213af4b9e10a15a5e8d93ca8..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kadeploy-devel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.121" - } - }, - "type": "server", - "uid": "kadeploy-devel" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kadeploy.json b/data/grid5000/sites/strasbourg/servers/kadeploy.json deleted file mode 100644 index e958d2ca60dc4436acba54725433c7492922d02d..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kadeploy.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.111" - } - }, - "type": "server", - "uid": "kadeploy" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kavlan-1.json b/data/grid5000/sites/strasbourg/servers/kavlan-1.json deleted file mode 100644 index 55e2a9a9d6ba410b7aab4ad099a2e567be6e9004..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kavlan-1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.118" - } - }, - "type": "server", - "uid": "kavlan-1" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kavlan-2.json b/data/grid5000/sites/strasbourg/servers/kavlan-2.json deleted file mode 100644 index a525a249b0806bc9785a127da0ce14b727373efc..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kavlan-2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.119" - } - }, - "type": "server", - "uid": "kavlan-2" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kavlan-3.json b/data/grid5000/sites/strasbourg/servers/kavlan-3.json deleted file mode 100644 index 70184f7e711becff34bdc9afa6a68c28700f2735..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kavlan-3.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.120" - } - }, - "type": "server", - "uid": "kavlan-3" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kavlan-agent.json b/data/grid5000/sites/strasbourg/servers/kavlan-agent.json deleted file mode 100644 index fb67356e6b4d197a57f81c6f1273823150b23f59..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kavlan-agent.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.125" - } - }, - "type": "server", - "uid": "kavlan-agent" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kavlan.json b/data/grid5000/sites/strasbourg/servers/kavlan.json deleted file mode 100644 index 3a1de414afedbc6299acfa435910f07b1d33d3f0..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kavlan.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.117" - } - }, - "type": "server", - "uid": "kavlan" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/kwollect.json b/data/grid5000/sites/strasbourg/servers/kwollect.json deleted file mode 100644 index e5a5acc846bd21eb16bbd45b8c53643659298fdf..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/kwollect.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.124" - } - }, - "type": "server", - "uid": "kwollect" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/ldap.json b/data/grid5000/sites/strasbourg/servers/ldap.json deleted file mode 100644 index 87bd9b333ba35d3290f05c1e60d8fcd41184e643..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/ldap.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.106" - } - }, - "type": "server", - "uid": "ldap" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/mail.json b/data/grid5000/sites/strasbourg/servers/mail.json deleted file mode 100644 index affb18aab5a86803b7fd4195daad69dc25247a22..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/mail.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.105" - } - }, - "type": "server", - "uid": "mail" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/nat.json b/data/grid5000/sites/strasbourg/servers/nat.json deleted file mode 100644 index 0b4ec5c4c312e42ea04505e880caf106de5c30b2..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/nat.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "alias": [ - "access" - ], - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.200" - } - }, - "type": "server", - "uid": "nat" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/oar.json b/data/grid5000/sites/strasbourg/servers/oar.json deleted file mode 100644 index 083160f0c17eb0e6f9bd09569cc3f8351740e180..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/oar.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.116" - } - }, - "type": "server", - "uid": "oar" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/oxidized.json b/data/grid5000/sites/strasbourg/servers/oxidized.json deleted file mode 100644 index 6c6c7c3324c0ae889ea2f767be567ac4e175db15..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/oxidized.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.122" - } - }, - "type": "server", - "uid": "oxidized" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/puppet6.json b/data/grid5000/sites/strasbourg/servers/puppet6.json deleted file mode 100644 index 308742a74404ed98acbc536746455f6394775364..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/puppet6.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "alias": [ - "puppet" - ], - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.108" - } - }, - "type": "server", - "uid": "puppet6" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/pve-1.json b/data/grid5000/sites/strasbourg/servers/pve-1.json deleted file mode 100644 index 3983ee8d40cc0c2ae50fcd400ba742e6506d82d2..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/pve-1.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "alias": [ - "ntp" - ], - "kind": "physical", - "network_adapters": { - "adm": { - "ip": "172.17.175.1" - }, - "bmc": { - "ip": "172.17.174.1", - "mac": "5c:ed:8c:34:9c:7c" - }, - "default": { - "ip": "172.16.175.1", - "mac": "30:3e:a7:00:75:e8" - } - }, - "serial": "CZJ2370N65", - "type": "server", - "uid": "pve-1" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/pve-2.json b/data/grid5000/sites/strasbourg/servers/pve-2.json deleted file mode 100644 index 1accb16598c355e41ef59d7a9b004e23a1ebc328..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/pve-2.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "kind": "physical", - "network_adapters": { - "adm": { - "ip": "172.17.175.2" - }, - "bmc": { - "ip": "172.17.174.2", - "mac": "5c:ed:8C:34:9c:d0" - }, - "default": { - "ip": "172.16.175.2", - "mac": "30:3e:a7:00:77:00" - } - }, - "serial": "CZJ2370N64", - "type": "server", - "uid": "pve-2" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/srv-data.json b/data/grid5000/sites/strasbourg/servers/srv-data.json deleted file mode 100644 index 859d7d81b0a47749bd8c552b35380e9216d7f067..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/srv-data.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "alias": [ - "nfs" - ], - "kind": "physical", - "network_adapters": { - "adm": { - "ip": "172.17.175.3" - }, - "bmc": { - "ip": "172.17.174.3", - "mac": "5c:ed:8c:32:e2:5e" - }, - "default": { - "ip": "172.16.175.3", - "mac": "30:3e:a7:00:77:80" - } - }, - "serial": "CZ223607QR", - "type": "server", - "uid": "srv-data" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/supervision2.json b/data/grid5000/sites/strasbourg/servers/supervision2.json deleted file mode 100644 index 93e28032862f85b6ebf0bf595fe5135e29ec93ae..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/supervision2.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.103" - } - }, - "type": "server", - "uid": "supervision2" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/servers/syslog.json b/data/grid5000/sites/strasbourg/servers/syslog.json deleted file mode 100644 index bf55bfd4f25626b6effad4dfa2b5cdee68d6e105..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/servers/syslog.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "kind": "virtual", - "network_adapters": { - "default": { - "ip": "172.16.175.104" - } - }, - "type": "server", - "uid": "syslog" -} \ No newline at end of file diff --git a/data/grid5000/sites/strasbourg/strasbourg.json b/data/grid5000/sites/strasbourg/strasbourg.json deleted file mode 100644 index 7eb9f075ea2e6246a114567b2e48ca29f80fd352..0000000000000000000000000000000000000000 --- a/data/grid5000/sites/strasbourg/strasbourg.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "compilation_server": false, - "description": "Grid5000 Strasbourg site", - "email_contact": "support-staff@lists.grid5000.fr", - "frontend_ip": "172.16.175.110", - "g5ksubnet": { - "gateway": "10.163.255.254", - "network": "10.160.0.0/14" - }, - "ipv6": { - "prefix": "2001:660:4406:a00::/56", - "site_global_kavlan": 19, - "site_index": 10 - }, - "kavlan_ip_range": "10.36.0.0/14", - "kavlans": { - "1": { - "gateway": "192.168.207.254", - "network": "192.168.192.0/20", - "network_ipv6": "2001:660:4406:a80::/64" - }, - "19": { - "gateway": "10.39.255.254", - "gateway_ipv6": "2001:660:4406:aa0:a00:0:ffff:ffff", - "network": "10.39.192.0/18", - "network_ipv6": "2001:660:4406:aa0::/64" - }, - "2": { - "gateway": "192.168.223.254", - "network": "192.168.208.0/20", - "network_ipv6": "2001:660:4406:a81::/64" - }, - "3": { - "gateway": "192.168.239.254", - "network": "192.168.224.0/20", - "network_ipv6": "2001:660:4406:a82::/64" - }, - "4": { - "gateway": "10.36.63.254", - "gateway_ipv6": "2001:660:4406:a90::ffff:ffff", - "network": "10.36.0.0/18", - "network_ipv6": "2001:660:4406:a90::/64" - }, - "5": { - "gateway": "10.36.127.254", - "gateway_ipv6": "2001:660:4406:a91::ffff:ffff", - "network": "10.36.64.0/18", - "network_ipv6": "2001:660:4406:a91::/64" - }, - "6": { - "gateway": "10.36.191.254", - "gateway_ipv6": "2001:660:4406:a92::ffff:ffff", - "network": "10.36.128.0/18", - "network_ipv6": "2001:660:4406:a92::/64" - }, - "7": { - "gateway": "10.36.255.254", - "gateway_ipv6": "2001:660:4406:a93::ffff:ffff", - "network": "10.36.192.0/18", - "network_ipv6": "2001:660:4406:a93::/64" - }, - "8": { - "gateway": "10.37.63.254", - "gateway_ipv6": "2001:660:4406:a94::ffff:ffff", - "network": "10.37.0.0/18", - "network_ipv6": "2001:660:4406:a94::/64" - }, - "9": { - "gateway": "10.37.127.254", - "gateway_ipv6": "2001:660:4406:a95::ffff:ffff", - "network": "10.37.64.0/18", - "network_ipv6": "2001:660:4406:a95::/64" - }, - "default": { - "gateway": "172.16.175.254", - "gateway_ipv6": "2001:660:4406:a00::ffff:ffff", - "network": "172.16.160.0/20", - "network_ipv6": "2001:660:4406:a00::/64" - } - }, - "latitude": 48.58048, - "location": "Strasbourg, France", - "longitude": 7.76335, - "name": "Strasbourg", - "production": true, - "renater_ip": "192.168.4.23", - "security_contact": "support-staff@lists.grid5000.fr", - "sys_admin_contact": "support-staff@lists.grid5000.fr", - "type": "site", - "uid": "strasbourg", - "user_support_contact": "support-staff@lists.grid5000.fr", - "virt_ip_range": "10.168.0.0/14", - "web": "http://www.grid5000.fr/w/Strasbourg:Home" -} \ No newline at end of file diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml index 4678ac52a8c8a110d04b66f67d2c2d0c4c58c501..fd671a5cedcbc06db7f6b58e0afaa097ead8b405 100644 --- a/input/grid5000/ipv4.yaml +++ b/input/grid5000/ipv4.yaml @@ -9,7 +9,6 @@ ipv4: rennes 0 0 96 0 toulouse 0 0 112 0 sophia 0 0 128 0 - strasbourg 0 0 160 0 luxembourg 0 0 176 0 nantes 0 0 192 0 iface_offsets: |- @@ -73,4 +72,3 @@ ipv4: rennes abacus25 eth0 0 0 13 24 sophia uvb eth0 0 0 4 0 toulouse montcalm eth0 0 0 8 0 - strasbourg fleckenstein eth0 0 0 0 0 \ No newline at end of file diff --git a/input/grid5000/ipv6.yaml b/input/grid5000/ipv6.yaml index 36435059c81de66368d7d9c05d32116cbab38efb..3dc5dc9f0de09af171c33785d4cdbd83280df79d 100644 --- a/input/grid5000/ipv6.yaml +++ b/input/grid5000/ipv6.yaml @@ -11,7 +11,6 @@ ipv6: rennes: 7 sophia: 8 toulouse: 9 - strasbourg: 10 site_global_kavlans: grenoble: 11 lille: 12 @@ -22,4 +21,3 @@ ipv6: rennes: 16 toulouse: 17 sophia: 18 - strasbourg: 19 diff --git a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml b/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml deleted file mode 100644 index 9bcbc48058c5561ffc2ac917700743283ea5dd0d..0000000000000000000000000000000000000000 --- a/input/grid5000/sites/strasbourg/networks/gw-strasbourg.yml +++ /dev/null @@ -1,100 +0,0 @@ ---- -gw-strasbourg: - model: wedge100bf_32x - serial: AM26029251 - ip: 172.17.175.254 - ip6: 2001:660:4406:a00::ffff:ffff - kind: router - site: strasbourg - snmp_community: Unknown - vlans: - "vlan100": - administrative: yes - addresses: - - 172.16.175.254 - "vlan101": - addresses: - - 172.17.175.254 - "vlan500": - addresses: - - 192.168.4.23 - "vlan701": - name: kavlan-1 - addresses: - - 192.168.192.0/20 - "vlan702": - name: kavlan-2 - addresses: - - 192.168.208.0/20 - "vlan703": - name: kavlan-3 - addresses: - - 192.168.224.0/20 - "vlan704": - name: kavlan-4 - addresses: - - 10.36.0.0/18 - "vlan705": - name: kavlan-5 - addresses: - - 10.36.64.0/18 - "vlan706": - name: kavlan-6 - addresses: - - 10.36.128.0/18 - "vlan707": - name: kavlan-7 - addresses: - - 10.36.192.0/18 - "vlan708": - name: kavlan-8 - addresses: - - 10.37.0.0/18 - "vlan709": - name: kavlan-9 - addresses: - - 10.37.64.0/18 - "vlan719": - name: kavlan-19 - addresses: - - 10.39.192.0/18 - linecards: - 1: - rate: 25000000000 - snmp_pattern: "Ethernet%PORT%" - kavlan_pattern: "%PORT%" - kind: node - ports: - 0: srv-data - 2: pve-1 - 3: pve-2 - 6: fleckenstein-1-eth0 - 7: fleckenstein-1-eth1 - 8: fleckenstein-1-eth2 - 9: fleckenstein-2-eth0 - 10: fleckenstein-2-eth1 - 11: fleckenstein-2-eth2 - 12: fleckenstein-3-eth0 - 13: fleckenstein-3-eth1 - 14: fleckenstein-3-eth2 - 15: fleckenstein-4-eth0 - 16: fleckenstein-4-eth1 - 17: fleckenstein-4-eth2 - 18: fleckenstein-5-eth0 - 19: fleckenstein-5-eth1 - 20: fleckenstein-5-eth2 - 21: fleckenstein-6-eth0 - 22: fleckenstein-6-eth1 - 23: fleckenstein-6-eth2 - 24: fleckenstein-7-eth0 - 25: fleckenstein-7-eth1 - 26: fleckenstein-7-eth2 - 27: fleckenstein-8-eth0 - 28: fleckenstein-8-eth1 - 29: fleckenstein-8-eth2 - 30: fleckenstein-9-eth0 - 31: fleckenstein-9-eth1 - 32: fleckenstein-9-eth2 - 33: fleckenstein-10-eth0 - 34: fleckenstein-10-eth1 - 35: fleckenstein-10-eth2 \ No newline at end of file diff --git a/input/grid5000/sites/strasbourg/servers/physical.yaml b/input/grid5000/sites/strasbourg/servers/physical.yaml deleted file mode 100644 index 84b8472fd2dbd97da56fc878dba00155b2d6c950..0000000000000000000000000000000000000000 --- a/input/grid5000/sites/strasbourg/servers/physical.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -pve-1: - kind: physical - serial: CZJ2370N65 - alias: [ntp] - network_adapters: - bmc: - ip: 172.17.174.1 - mac: 5c:ed:8c:34:9c:7c - default: - ip: 172.16.175.1 - mac: 30:3e:a7:00:75:e8 - adm: - ip: 172.17.175.1 - -pve-2: - kind: physical - serial: CZJ2370N64 - network_adapters: - bmc: - ip: 172.17.174.2 - mac: 5c:ed:8C:34:9c:d0 - default: - ip: 172.16.175.2 - mac: 30:3e:a7:00:77:00 - adm: - ip: 172.17.175.2 - -srv-data: - kind: physical - serial: CZ223607QR - alias: [nfs] - network_adapters: - bmc: - ip: 172.17.174.3 - mac: 5c:ed:8c:32:e2:5e - default: - ip: 172.16.175.3 - mac: 30:3e:a7:00:77:80 - adm: - ip: 172.17.175.3 \ No newline at end of file diff --git a/input/grid5000/sites/strasbourg/servers/virtual.yaml b/input/grid5000/sites/strasbourg/servers/virtual.yaml deleted file mode 100644 index 8beb5e5ddf7ef2e27862420296ea0a103b7554b8..0000000000000000000000000000000000000000 --- a/input/grid5000/sites/strasbourg/servers/virtual.yaml +++ /dev/null @@ -1,143 +0,0 @@ -supervision2: - kind: virtual - network_adapters: - default: - ip: 172.16.175.103 -syslog: - kind: virtual - network_adapters: - default: - ip: 172.16.175.104 -mail: - kind: virtual - network_adapters: - default: - ip: 172.16.175.105 -ldap: - kind: virtual - network_adapters: - default: - ip: 172.16.175.106 -dns: - kind: virtual - network_adapters: - default: - ip: 172.16.175.107 -puppet6: - kind: virtual - alias: - - puppet - network_adapters: - default: - ip: 172.16.175.108 -dhcp: - kind: virtual - network_adapters: - default: - ip: 172.16.175.109 - -fstrasbourg: - kind: virtual - alias: - - oar-api - - frontend - network_adapters: - default: - ip: 172.16.175.110 - -kadeploy: - kind: virtual - network_adapters: - default: - ip: 172.16.175.111 - -api-server-v3: - kind: virtual - network_adapters: - default: - ip: 172.16.175.112 - -conman: - kind: virtual - network_adapters: - default: - ip: 172.16.175.113 - -api-server-devel: - kind: virtual - network_adapters: - default: - ip: 172.16.175.114 - -api-proxy: - kind: virtual - network_adapters: - default: - ip: 172.16.175.115 - -oar: - kind: virtual - network_adapters: - default: - ip: 172.16.175.116 - -kavlan: - kind: virtual - network_adapters: - default: - ip: 172.16.175.117 - -kavlan-1: - kind: virtual - network_adapters: - default: - ip: 172.16.175.118 - -kavlan-2: - kind: virtual - network_adapters: - default: - ip: 172.16.175.119 - -kavlan-3: - kind: virtual - network_adapters: - default: - ip: 172.16.175.120 - -kadeploy-devel: - kind: virtual - network_adapters: - default: - ip: 172.16.175.121 - -oxidized: - kind: virtual - network_adapters: - default: - ip: 172.16.175.122 - -guix: - kind: virtual - network_adapters: - default: - ip: 172.16.175.123 - -kwollect: - kind: virtual - network_adapters: - default: - ip: 172.16.175.124 - -kavlan-agent: - kind: virtual - network_adapters: - default: - ip: 172.16.175.125 - -nat: - kind: virtual - alias: [access] - network_adapters: - default: - ip: 172.16.175.200 \ No newline at end of file diff --git a/input/grid5000/sites/strasbourg/strasbourg.yaml b/input/grid5000/sites/strasbourg/strasbourg.yaml deleted file mode 100644 index eda53e87e9a1a98fee5a11918470ef2671543def..0000000000000000000000000000000000000000 --- a/input/grid5000/sites/strasbourg/strasbourg.yaml +++ /dev/null @@ -1,66 +0,0 @@ ---- -name: Strasbourg -location: Strasbourg, France -web: http://www.grid5000.fr/w/Strasbourg:Home -description: Grid5000 Strasbourg site -latitude: 48.58048 -longitude: 7.76335 -email_contact: support-staff@lists.grid5000.fr -sys_admin_contact: support-staff@lists.grid5000.fr -security_contact: support-staff@lists.grid5000.fr -user_support_contact: support-staff@lists.grid5000.fr -compilation_server: false -kavlan_ip_range: 10.36.0.0/14 -virt_ip_range: 10.168.0.0/14 -renater_ip: 192.168.4.23 -production: true -frontend_ip: 172.16.175.110 - -g5ksubnet: - network: 10.160.0.0/14 - gateway: 10.163.255.254 - -kavlans: - default: - network: 172.16.160.0/20 - gateway: 172.16.175.254 - - 1: - network: 192.168.192.0/20 - gateway: 192.168.207.254 - - 2: - network: 192.168.208.0/20 - gateway: 192.168.223.254 - - 3: - network: 192.168.224.0/20 - gateway: 192.168.239.254 - - 4: - network: 10.36.0.0/18 - gateway: 10.36.63.254 - - 5: - network: 10.36.64.0/18 - gateway: 10.36.127.254 - - 6: - network: 10.36.128.0/18 - gateway: 10.36.191.254 - - 7: - network: 10.36.192.0/18 - gateway: 10.36.255.254 - - 8: - network: 10.37.0.0/18 - gateway: 10.37.63.254 - - 9: - network: 10.37.64.0/18 - gateway: 10.37.127.254 - - 19: - network: 10.39.192.0/18 - gateway: 10.39.255.254 \ No newline at end of file