From ad2be2a5c80139e1b19d2badcdf495e7f4a3f475 Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Wed, 2 Dec 2020 12:04:37 +0100
Subject: [PATCH] [all] add guix servers
---
data/grid5000/sites/grenoble/servers/guix.json | 10 ++++++++++
.../sites/lille/servers/{guix-dev.json => guix.json} | 2 +-
data/grid5000/sites/luxembourg/servers/guix.json | 10 ++++++++++
.../sites/lyon/servers/{guix-dev.json => guix.json} | 2 +-
data/grid5000/sites/nancy/servers/guix.json | 10 ++++++++++
data/grid5000/sites/nantes/servers/guix.json | 10 ++++++++++
data/grid5000/sites/rennes/servers/guix.json | 10 ++++++++++
.../sites/sophia/servers/{guix-dev.json => guix.json} | 2 +-
input/grid5000/sites/grenoble/servers/virtual.yaml | 5 +++++
input/grid5000/sites/lille/servers/virtual.yaml | 2 +-
input/grid5000/sites/luxembourg/servers/virtual.yaml | 5 +++++
input/grid5000/sites/lyon/servers/virtual.yaml | 2 +-
input/grid5000/sites/nancy/servers/virtual.yaml | 5 +++++
input/grid5000/sites/nantes/servers/virtual.yaml | 7 ++++++-
input/grid5000/sites/rennes/servers/virtual.yaml | 5 +++++
input/grid5000/sites/sophia/servers/virtual.yaml | 2 +-
16 files changed, 82 insertions(+), 7 deletions(-)
create mode 100644 data/grid5000/sites/grenoble/servers/guix.json
rename data/grid5000/sites/lille/servers/{guix-dev.json => guix.json} (86%)
create mode 100644 data/grid5000/sites/luxembourg/servers/guix.json
rename data/grid5000/sites/lyon/servers/{guix-dev.json => guix.json} (86%)
create mode 100644 data/grid5000/sites/nancy/servers/guix.json
create mode 100644 data/grid5000/sites/nantes/servers/guix.json
create mode 100644 data/grid5000/sites/rennes/servers/guix.json
rename data/grid5000/sites/sophia/servers/{guix-dev.json => guix.json} (86%)
diff --git a/data/grid5000/sites/grenoble/servers/guix.json b/data/grid5000/sites/grenoble/servers/guix.json
new file mode 100644
index 00000000000..8ff0a77ab22
--- /dev/null
+++ b/data/grid5000/sites/grenoble/servers/guix.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.31.128"
+ }
+ },
+ "type": "server",
+ "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/guix-dev.json b/data/grid5000/sites/lille/servers/guix.json
similarity index 86%
rename from data/grid5000/sites/lille/servers/guix-dev.json
rename to data/grid5000/sites/lille/servers/guix.json
index e2b6a85c2e5..135068268d0 100644
--- a/data/grid5000/sites/lille/servers/guix-dev.json
+++ b/data/grid5000/sites/lille/servers/guix.json
@@ -6,5 +6,5 @@
}
},
"type": "server",
- "uid": "guix-dev"
+ "uid": "guix"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/guix.json b/data/grid5000/sites/luxembourg/servers/guix.json
new file mode 100644
index 00000000000..f11f2c40ac3
--- /dev/null
+++ b/data/grid5000/sites/luxembourg/servers/guix.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.191.130"
+ }
+ },
+ "type": "server",
+ "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/guix-dev.json b/data/grid5000/sites/lyon/servers/guix.json
similarity index 86%
rename from data/grid5000/sites/lyon/servers/guix-dev.json
rename to data/grid5000/sites/lyon/servers/guix.json
index 33ebc63c5ca..56456dc24e7 100644
--- a/data/grid5000/sites/lyon/servers/guix-dev.json
+++ b/data/grid5000/sites/lyon/servers/guix.json
@@ -6,5 +6,5 @@
}
},
"type": "server",
- "uid": "guix-dev"
+ "uid": "guix"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/guix.json b/data/grid5000/sites/nancy/servers/guix.json
new file mode 100644
index 00000000000..51141d3cb2a
--- /dev/null
+++ b/data/grid5000/sites/nancy/servers/guix.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.79.135"
+ }
+ },
+ "type": "server",
+ "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/guix.json b/data/grid5000/sites/nantes/servers/guix.json
new file mode 100644
index 00000000000..687157d710c
--- /dev/null
+++ b/data/grid5000/sites/nantes/servers/guix.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.207.131"
+ }
+ },
+ "type": "server",
+ "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/guix.json b/data/grid5000/sites/rennes/servers/guix.json
new file mode 100644
index 00000000000..73d3e96e953
--- /dev/null
+++ b/data/grid5000/sites/rennes/servers/guix.json
@@ -0,0 +1,10 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "default": {
+ "ip": "172.16.111.121"
+ }
+ },
+ "type": "server",
+ "uid": "guix"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/guix-dev.json b/data/grid5000/sites/sophia/servers/guix.json
similarity index 86%
rename from data/grid5000/sites/sophia/servers/guix-dev.json
rename to data/grid5000/sites/sophia/servers/guix.json
index a2362bfc769..3e899f5ed91 100644
--- a/data/grid5000/sites/sophia/servers/guix-dev.json
+++ b/data/grid5000/sites/sophia/servers/guix.json
@@ -6,5 +6,5 @@
}
},
"type": "server",
- "uid": "guix-dev"
+ "uid": "guix"
}
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/servers/virtual.yaml b/input/grid5000/sites/grenoble/servers/virtual.yaml
index 7cc567df656..6a98f0dfbb3 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -85,3 +85,8 @@ supervision2:
kwollect:
kind: virtual
network_adapters: {default: {ip: 172.16.31.127}}
+guix:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.31.128
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 76a34411eaf..86cdd8abfc3 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -246,7 +246,7 @@ elk-dev:
network_adapters:
default:
ip: 172.16.47.146
-guix-dev:
+guix:
kind: virtual
network_adapters:
default:
diff --git a/input/grid5000/sites/luxembourg/servers/virtual.yaml b/input/grid5000/sites/luxembourg/servers/virtual.yaml
index 6b229d37915..a680ff6dc95 100644
--- a/input/grid5000/sites/luxembourg/servers/virtual.yaml
+++ b/input/grid5000/sites/luxembourg/servers/virtual.yaml
@@ -86,3 +86,8 @@ www:
kwollect:
kind: virtual
network_adapters: {default: {ip: 172.16.191.129}}
+guix:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.191.130
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index 9aaba17472b..c8de33db3b0 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -88,7 +88,7 @@ kwapi-dev:
oxidized:
kind: virtual
network_adapters: {default: {ip: 172.16.63.131}}
-guix-dev:
+guix:
kind: virtual
network_adapters: {default: {ip: 172.16.63.132}}
guix-builder:
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 176a37b6177..333cb84001a 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -111,3 +111,8 @@ sgrcinq1-ib-bmc:
default:
ip: 172.17.79.225
mac: 00:02:C9:63:4E:0E
+guix:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.79.135
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index 3d25147184a..5960c37a7d6 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -154,4 +154,9 @@ infra-k8s-master1:
kind: virtual
network_adapters:
default:
- ip: 172.16.207.130
\ No newline at end of file
+ ip: 172.16.207.130
+guix:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.207.131
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index 3fb0b38354b..b614ba5139e 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -144,3 +144,8 @@ infra-k8s-master1:
kwollect:
kind: virtual
network_adapters: {default: {ip: 172.16.111.112}}
+guix:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.111.121
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index 66916ffd632..fb774ecd38b 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -177,7 +177,7 @@ fsophia-devel:
network_adapters:
default:
ip: 172.16.143.143
-guix-dev:
+guix:
kind: virtual
network_adapters:
default:
--
GitLab