From 6156f9e90717df34c31f7c93d903acab4134288f Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Fri, 25 Sep 2020 08:23:27 +0200
Subject: [PATCH] [nantes] Add aliases to ceph0
---
data/grid5000/sites/nantes/servers/ceph0.json | 3 ++-
data/grid5000/sites/nantes/servers/csod.json | 10 ----------
input/grid5000/sites/nantes/servers/servers.yaml | 1 +
input/grid5000/sites/nantes/servers/virtual.yaml | 5 -----
4 files changed, 3 insertions(+), 16 deletions(-)
delete mode 100644 data/grid5000/sites/nantes/servers/csod.json
diff --git a/data/grid5000/sites/nantes/servers/ceph0.json b/data/grid5000/sites/nantes/servers/ceph0.json
index c022ccd260..10daf12598 100644
--- a/data/grid5000/sites/nantes/servers/ceph0.json
+++ b/data/grid5000/sites/nantes/servers/ceph0.json
@@ -3,7 +3,8 @@
"ceph-dashboard",
"grafana",
"alertmanager",
- "prometheus"
+ "prometheus",
+ "csod"
],
"kind": "physical",
"network_adapters": {
diff --git a/data/grid5000/sites/nantes/servers/csod.json b/data/grid5000/sites/nantes/servers/csod.json
deleted file mode 100644
index 89ead67564..0000000000
--- a/data/grid5000/sites/nantes/servers/csod.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.207.128"
- }
- },
- "type": "server",
- "uid": "csod"
-}
\ No newline at end of file
diff --git a/input/grid5000/sites/nantes/servers/servers.yaml b/input/grid5000/sites/nantes/servers/servers.yaml
index fcb318e003..e7d14725e9 100644
--- a/input/grid5000/sites/nantes/servers/servers.yaml
+++ b/input/grid5000/sites/nantes/servers/servers.yaml
@@ -70,6 +70,7 @@ ceph0:
- grafana
- alertmanager
- prometheus
+ - csod
warranty: 2019-12
serial: 4CL5842
network_adapters:
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index a9295377ec..3d25147184 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -19,11 +19,6 @@ conman:
network_adapters:
default:
ip: 172.16.207.115
-csod:
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.207.128
dhcp:
kind: virtual
network_adapters:
--
GitLab