From 32448a975087d70bcb4365ccbbde8bbc4f7fd39a Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Thu, 20 Jul 2017 11:44:52 +0200
Subject: [PATCH] [nantes] update yaml servers (json)
---
.../sites/nantes/servers/api-proxy.json | 3 -
.../nantes/servers/api-server-devel.json | 3 -
.../sites/nantes/servers/api-server-v3.json | 10 +
.../servers/{ceph100.json => ceph0.json} | 2 +-
.../servers/{ceph101.json => ceph1.json} | 2 +-
.../servers/{ceph102.json => ceph2.json} | 2 +-
.../servers/{ceph103.json => ceph3.json} | 2 +-
.../grid5000/sites/nantes/servers/conman.json | 6 -
data/grid5000/sites/nantes/servers/csod.json | 10 +
data/grid5000/sites/nantes/servers/dhcp.json | 3 -
data/grid5000/sites/nantes/servers/dns.json | 3 -
.../sites/nantes/servers/fnantes.json | 3 +-
.../sites/nantes/servers/ganglia-dev.json | 10 +
.../sites/nantes/servers/ganglia.json | 3 -
.../sites/nantes/servers/kadeploy-devel.json | 2 +-
.../sites/nantes/servers/kadeploy.json | 2 +-
.../sites/nantes/servers/kavlan-1.json | 3 -
.../sites/nantes/servers/kavlan-2.json | 3 -
.../sites/nantes/servers/kavlan-3.json | 3 -
.../grid5000/sites/nantes/servers/kavlan.json | 3 -
data/grid5000/sites/nantes/servers/kwapi.json | 3 -
data/grid5000/sites/nantes/servers/ldap.json | 3 -
data/grid5000/sites/nantes/servers/mail.json | 3 -
data/grid5000/sites/nantes/servers/mysql.json | 3 -
data/grid5000/sites/nantes/servers/oar.json | 14 ++
data/grid5000/sites/nantes/servers/proxy.json | 3 -
.../grid5000/sites/nantes/servers/puppet.json | 10 +
.../sites/nantes/servers/puppet4.json | 10 +
data/grid5000/sites/nantes/servers/srv-2.json | 2 +-
data/grid5000/sites/nantes/servers/srv.json | 4 +-
.../sites/nantes/servers/supervision.json | 13 ++
.../sites/nantes/servers/supervision2.json | 14 ++
.../grid5000/sites/nantes/servers/syslog.json | 10 +
data/grid5000/sites/nantes/servers/www.json | 10 +
grid5000-all.json | 186 ++++++++++++------
35 files changed, 247 insertions(+), 119 deletions(-)
create mode 100644 data/grid5000/sites/nantes/servers/api-server-v3.json
rename data/grid5000/sites/nantes/servers/{ceph100.json => ceph0.json} (93%)
rename data/grid5000/sites/nantes/servers/{ceph101.json => ceph1.json} (93%)
rename data/grid5000/sites/nantes/servers/{ceph102.json => ceph2.json} (93%)
rename data/grid5000/sites/nantes/servers/{ceph103.json => ceph3.json} (93%)
create mode 100644 data/grid5000/sites/nantes/servers/csod.json
create mode 100644 data/grid5000/sites/nantes/servers/ganglia-dev.json
create mode 100644 data/grid5000/sites/nantes/servers/oar.json
create mode 100644 data/grid5000/sites/nantes/servers/puppet.json
create mode 100644 data/grid5000/sites/nantes/servers/puppet4.json
create mode 100644 data/grid5000/sites/nantes/servers/supervision.json
create mode 100644 data/grid5000/sites/nantes/servers/supervision2.json
create mode 100644 data/grid5000/sites/nantes/servers/syslog.json
create mode 100644 data/grid5000/sites/nantes/servers/www.json
diff --git a/data/grid5000/sites/nantes/servers/api-proxy.json b/data/grid5000/sites/nantes/servers/api-proxy.json
index a5688621a0b..bbe3c087e77 100644
--- a/data/grid5000/sites/nantes/servers/api-proxy.json
+++ b/data/grid5000/sites/nantes/servers/api-proxy.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/api-server-devel.json b/data/grid5000/sites/nantes/servers/api-server-devel.json
index 8d08497e8f3..f0a74fe1093 100644
--- a/data/grid5000/sites/nantes/servers/api-server-devel.json
+++ b/data/grid5000/sites/nantes/servers/api-server-devel.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/api-server-v3.json b/data/grid5000/sites/nantes/servers/api-server-v3.json
new file mode 100644
index 00000000000..821edb50f76
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/api-server-v3.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.118"
+ }
+ },
+ "type": "server",
+ "uid": "api-server-v3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/ceph100.json b/data/grid5000/sites/nantes/servers/ceph0.json
similarity index 93%
rename from data/grid5000/sites/nantes/servers/ceph100.json
rename to data/grid5000/sites/nantes/servers/ceph0.json
index 398ba88abe6..9800cb391ab 100644
--- a/data/grid5000/sites/nantes/servers/ceph100.json
+++ b/data/grid5000/sites/nantes/servers/ceph0.json
@@ -15,6 +15,6 @@
},
"serial": "4CL5842",
"type": "server",
- "uid": "ceph100",
+ "uid": "ceph0",
"warranty": 12.2019
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/ceph101.json b/data/grid5000/sites/nantes/servers/ceph1.json
similarity index 93%
rename from data/grid5000/sites/nantes/servers/ceph101.json
rename to data/grid5000/sites/nantes/servers/ceph1.json
index e5d7ca33b18..923668c2130 100644
--- a/data/grid5000/sites/nantes/servers/ceph101.json
+++ b/data/grid5000/sites/nantes/servers/ceph1.json
@@ -15,6 +15,6 @@
},
"serial": "GBL5842",
"type": "server",
- "uid": "ceph101",
+ "uid": "ceph1",
"warranty": 12.2019
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/ceph102.json b/data/grid5000/sites/nantes/servers/ceph2.json
similarity index 93%
rename from data/grid5000/sites/nantes/servers/ceph102.json
rename to data/grid5000/sites/nantes/servers/ceph2.json
index 79263826243..3b485b7d36f 100644
--- a/data/grid5000/sites/nantes/servers/ceph102.json
+++ b/data/grid5000/sites/nantes/servers/ceph2.json
@@ -15,6 +15,6 @@
},
"serial": "1CL5842",
"type": "server",
- "uid": "ceph102",
+ "uid": "ceph2",
"warranty": 12.2019
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/ceph103.json b/data/grid5000/sites/nantes/servers/ceph3.json
similarity index 93%
rename from data/grid5000/sites/nantes/servers/ceph103.json
rename to data/grid5000/sites/nantes/servers/ceph3.json
index 49e016c08b9..fd1a0e6700c 100644
--- a/data/grid5000/sites/nantes/servers/ceph103.json
+++ b/data/grid5000/sites/nantes/servers/ceph3.json
@@ -15,6 +15,6 @@
},
"serial": "FBL5842",
"type": "server",
- "uid": "ceph103",
+ "uid": "ceph3",
"warranty": 12.2019
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/conman.json b/data/grid5000/sites/nantes/servers/conman.json
index 53e52dfe303..e49ac1aa2c5 100644
--- a/data/grid5000/sites/nantes/servers/conman.json
+++ b/data/grid5000/sites/nantes/servers/conman.json
@@ -1,12 +1,6 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
- "adm": {
- "ip": "172.17.207.115"
- },
"default": {
"ip": "172.16.207.115"
}
diff --git a/data/grid5000/sites/nantes/servers/csod.json b/data/grid5000/sites/nantes/servers/csod.json
new file mode 100644
index 00000000000..89ead675640
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/csod.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.128"
+ }
+ },
+ "type": "server",
+ "uid": "csod"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/dhcp.json b/data/grid5000/sites/nantes/servers/dhcp.json
index 610cede19b6..17bd2926482 100644
--- a/data/grid5000/sites/nantes/servers/dhcp.json
+++ b/data/grid5000/sites/nantes/servers/dhcp.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/nantes/servers/dns.json b/data/grid5000/sites/nantes/servers/dns.json
index 459acb63c86..b96bf7eeb75 100644
--- a/data/grid5000/sites/nantes/servers/dns.json
+++ b/data/grid5000/sites/nantes/servers/dns.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/fnantes.json b/data/grid5000/sites/nantes/servers/fnantes.json
index 0a0711db731..53827bc9bc9 100644
--- a/data/grid5000/sites/nantes/servers/fnantes.json
+++ b/data/grid5000/sites/nantes/servers/fnantes.json
@@ -1,6 +1,7 @@
{
"alias": [
-
+ "oar-api",
+ "frontend"
],
"kind": "virtual",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/ganglia-dev.json b/data/grid5000/sites/nantes/servers/ganglia-dev.json
new file mode 100644
index 00000000000..33e367cfe4e
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/ganglia-dev.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.129"
+ }
+ },
+ "type": "server",
+ "uid": "ganglia-dev"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/ganglia.json b/data/grid5000/sites/nantes/servers/ganglia.json
index 0b004a7c2a9..9b68cdf5fc9 100644
--- a/data/grid5000/sites/nantes/servers/ganglia.json
+++ b/data/grid5000/sites/nantes/servers/ganglia.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/kadeploy-devel.json b/data/grid5000/sites/nantes/servers/kadeploy-devel.json
index e3c419ea310..b0c25f3ebf7 100644
--- a/data/grid5000/sites/nantes/servers/kadeploy-devel.json
+++ b/data/grid5000/sites/nantes/servers/kadeploy-devel.json
@@ -1,6 +1,6 @@
{
"alias": [
-
+ "kadeploy-server-devel"
],
"kind": "virtual",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/kadeploy.json b/data/grid5000/sites/nantes/servers/kadeploy.json
index b53f260c8ae..46334ebef7f 100644
--- a/data/grid5000/sites/nantes/servers/kadeploy.json
+++ b/data/grid5000/sites/nantes/servers/kadeploy.json
@@ -1,6 +1,6 @@
{
"alias": [
-
+ "kadeploy-server"
],
"kind": "virtual",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/kavlan-1.json b/data/grid5000/sites/nantes/servers/kavlan-1.json
index 3647b4e8c30..253060e52c6 100644
--- a/data/grid5000/sites/nantes/servers/kavlan-1.json
+++ b/data/grid5000/sites/nantes/servers/kavlan-1.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/kavlan-2.json b/data/grid5000/sites/nantes/servers/kavlan-2.json
index 37d7ce7b495..aa91660bfda 100644
--- a/data/grid5000/sites/nantes/servers/kavlan-2.json
+++ b/data/grid5000/sites/nantes/servers/kavlan-2.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/kavlan-3.json b/data/grid5000/sites/nantes/servers/kavlan-3.json
index 3dfc2f3823f..b2e65b653bc 100644
--- a/data/grid5000/sites/nantes/servers/kavlan-3.json
+++ b/data/grid5000/sites/nantes/servers/kavlan-3.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/kavlan.json b/data/grid5000/sites/nantes/servers/kavlan.json
index 32e4492a900..3efc4b3b854 100644
--- a/data/grid5000/sites/nantes/servers/kavlan.json
+++ b/data/grid5000/sites/nantes/servers/kavlan.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/kwapi.json b/data/grid5000/sites/nantes/servers/kwapi.json
index e3258399691..d175f6f95ce 100644
--- a/data/grid5000/sites/nantes/servers/kwapi.json
+++ b/data/grid5000/sites/nantes/servers/kwapi.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/ldap.json b/data/grid5000/sites/nantes/servers/ldap.json
index 7747d7f460a..a7aced4ecc9 100644
--- a/data/grid5000/sites/nantes/servers/ldap.json
+++ b/data/grid5000/sites/nantes/servers/ldap.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/mail.json b/data/grid5000/sites/nantes/servers/mail.json
index 4f270d72740..2a19fe55b26 100644
--- a/data/grid5000/sites/nantes/servers/mail.json
+++ b/data/grid5000/sites/nantes/servers/mail.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/nantes/servers/mysql.json b/data/grid5000/sites/nantes/servers/mysql.json
index ac785a0b8d4..2e678cebe03 100644
--- a/data/grid5000/sites/nantes/servers/mysql.json
+++ b/data/grid5000/sites/nantes/servers/mysql.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/oar.json b/data/grid5000/sites/nantes/servers/oar.json
new file mode 100644
index 00000000000..095aa9d5a13
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/oar.json
@@ -0,0 +1,14 @@
+{
+ "alias": [
+ "oardb",
+ "oar-server"
+ ],
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.111"
+ }
+ },
+ "type": "server",
+ "uid": "oar"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/proxy.json b/data/grid5000/sites/nantes/servers/proxy.json
index aed5a289bd0..c256c06eb3f 100644
--- a/data/grid5000/sites/nantes/servers/proxy.json
+++ b/data/grid5000/sites/nantes/servers/proxy.json
@@ -1,7 +1,4 @@
{
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/puppet.json b/data/grid5000/sites/nantes/servers/puppet.json
new file mode 100644
index 00000000000..ae4c7ab990e
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/puppet.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.105"
+ }
+ },
+ "type": "server",
+ "uid": "puppet"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/puppet4.json b/data/grid5000/sites/nantes/servers/puppet4.json
new file mode 100644
index 00000000000..31077cfeb9c
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/puppet4.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.126"
+ }
+ },
+ "type": "server",
+ "uid": "puppet4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/srv-2.json b/data/grid5000/sites/nantes/servers/srv-2.json
index 0af7437e9c5..c70cd8c322d 100644
--- a/data/grid5000/sites/nantes/servers/srv-2.json
+++ b/data/grid5000/sites/nantes/servers/srv-2.json
@@ -1,6 +1,6 @@
{
"alias": [
-
+ "ntp"
],
"kind": "physical",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/srv.json b/data/grid5000/sites/nantes/servers/srv.json
index 6add3521b08..b5e98d8fc4e 100644
--- a/data/grid5000/sites/nantes/servers/srv.json
+++ b/data/grid5000/sites/nantes/servers/srv.json
@@ -1,7 +1,7 @@
{
"alias": [
- "ntp",
- "adminfront"
+ "adminfront",
+ "af"
],
"kind": "physical",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/supervision.json b/data/grid5000/sites/nantes/servers/supervision.json
new file mode 100644
index 00000000000..ce8f765deb2
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/supervision.json
@@ -0,0 +1,13 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.207.110"
+ },
+ "default": {
+ "ip": "172.16.207.110"
+ }
+ },
+ "type": "server",
+ "uid": "supervision"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/supervision2.json b/data/grid5000/sites/nantes/servers/supervision2.json
new file mode 100644
index 00000000000..fce71510047
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/supervision2.json
@@ -0,0 +1,14 @@
+{
+ "alias": [
+ "munin",
+ "nagios"
+ ],
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.127"
+ }
+ },
+ "type": "server",
+ "uid": "supervision2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/syslog.json b/data/grid5000/sites/nantes/servers/syslog.json
new file mode 100644
index 00000000000..8dfebbb51ce
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/syslog.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.116"
+ }
+ },
+ "type": "server",
+ "uid": "syslog"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/www.json b/data/grid5000/sites/nantes/servers/www.json
new file mode 100644
index 00000000000..92fc7c69179
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/www.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.114"
+ }
+ },
+ "type": "server",
+ "uid": "www"
+}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index 203818d1811..906cadc90ed 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -161683,9 +161683,6 @@
"security_contact": "support-staff@lists.grid5000.fr",
"servers": {
"api-proxy": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161696,9 +161693,6 @@
"uid": "api-proxy"
},
"api-server-devel": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161708,7 +161702,17 @@
"type": "server",
"uid": "api-server-devel"
},
- "ceph100": {
+ "api-server-v3": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.118"
+ }
+ },
+ "type": "server",
+ "uid": "api-server-v3"
+ },
+ "ceph0": {
"alias": [
],
@@ -161725,10 +161729,10 @@
},
"serial": "4CL5842",
"type": "server",
- "uid": "ceph100",
+ "uid": "ceph0",
"warranty": 12.2019
},
- "ceph101": {
+ "ceph1": {
"alias": [
],
@@ -161745,10 +161749,10 @@
},
"serial": "GBL5842",
"type": "server",
- "uid": "ceph101",
+ "uid": "ceph1",
"warranty": 12.2019
},
- "ceph102": {
+ "ceph2": {
"alias": [
],
@@ -161765,10 +161769,10 @@
},
"serial": "1CL5842",
"type": "server",
- "uid": "ceph102",
+ "uid": "ceph2",
"warranty": 12.2019
},
- "ceph103": {
+ "ceph3": {
"alias": [
],
@@ -161785,18 +161789,12 @@
},
"serial": "FBL5842",
"type": "server",
- "uid": "ceph103",
+ "uid": "ceph3",
"warranty": 12.2019
},
"conman": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
- "adm": {
- "ip": "172.17.207.115"
- },
"default": {
"ip": "172.16.207.115"
}
@@ -161804,10 +161802,17 @@
"type": "server",
"uid": "conman"
},
+ "csod": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.128"
+ }
+ },
+ "type": "server",
+ "uid": "csod"
+ },
"dhcp": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
@@ -161821,9 +161826,6 @@
"uid": "dhcp"
},
"dns": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161835,7 +161837,8 @@
},
"fnantes": {
"alias": [
-
+ "oar-api",
+ "frontend"
],
"kind": "virtual",
"network_adapters": {
@@ -161847,9 +161850,6 @@
"uid": "fnantes"
},
"ganglia": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161859,9 +161859,19 @@
"type": "server",
"uid": "ganglia"
},
+ "ganglia-dev": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.129"
+ }
+ },
+ "type": "server",
+ "uid": "ganglia-dev"
+ },
"kadeploy": {
"alias": [
-
+ "kadeploy-server"
],
"kind": "virtual",
"network_adapters": {
@@ -161877,7 +161887,7 @@
},
"kadeploy-devel": {
"alias": [
-
+ "kadeploy-server-devel"
],
"kind": "virtual",
"network_adapters": {
@@ -161892,9 +161902,6 @@
"uid": "kadeploy-devel"
},
"kavlan": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161905,9 +161912,6 @@
"uid": "kavlan"
},
"kavlan-1": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161918,9 +161922,6 @@
"uid": "kavlan-1"
},
"kavlan-2": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161931,9 +161932,6 @@
"uid": "kavlan-2"
},
"kavlan-3": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161944,9 +161942,6 @@
"uid": "kavlan-3"
},
"kwapi": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161957,9 +161952,6 @@
"uid": "kwapi"
},
"ldap": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161970,9 +161962,6 @@
"uid": "ldap"
},
"mail": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
@@ -161986,9 +161975,6 @@
"uid": "mail"
},
"mysql": {
- "alias": [
-
- ],
"kind": "virtual",
"network_adapters": {
"default": {
@@ -161998,10 +161984,21 @@
"type": "server",
"uid": "mysql"
},
- "proxy": {
+ "oar": {
"alias": [
-
+ "oardb",
+ "oar-server"
],
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.111"
+ }
+ },
+ "type": "server",
+ "uid": "oar"
+ },
+ "proxy": {
"kind": "virtual",
"network_adapters": {
"default": {
@@ -162011,10 +162008,30 @@
"type": "server",
"uid": "proxy"
},
+ "puppet": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.105"
+ }
+ },
+ "type": "server",
+ "uid": "puppet"
+ },
+ "puppet4": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.126"
+ }
+ },
+ "type": "server",
+ "uid": "puppet4"
+ },
"srv": {
"alias": [
- "ntp",
- "adminfront"
+ "adminfront",
+ "af"
],
"kind": "physical",
"network_adapters": {
@@ -162034,7 +162051,7 @@
},
"srv-2": {
"alias": [
-
+ "ntp"
],
"kind": "physical",
"network_adapters": {
@@ -162073,6 +162090,53 @@
"type": "server",
"uid": "srv-data",
"warranty": 11.2017
+ },
+ "supervision": {
+ "kind": "virtual",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.207.110"
+ },
+ "default": {
+ "ip": "172.16.207.110"
+ }
+ },
+ "type": "server",
+ "uid": "supervision"
+ },
+ "supervision2": {
+ "alias": [
+ "munin",
+ "nagios"
+ ],
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.127"
+ }
+ },
+ "type": "server",
+ "uid": "supervision2"
+ },
+ "syslog": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.116"
+ }
+ },
+ "type": "server",
+ "uid": "syslog"
+ },
+ "www": {
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.114"
+ }
+ },
+ "type": "server",
+ "uid": "www"
}
},
"storage5k": false,
--
GitLab