From 34432011a9f6058305ebee1ebead9ac2f8f80563 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Mon, 25 Jun 2018 09:26:58 +0200
Subject: [PATCH] [rennes] Update dhcp
---
.../sites/rennes/servers/{dhcp-prod.json => dhcp.json} | 7 ++-----
grid5000-all.json | 9 +++------
input/grid5000/sites/rennes/servers/virtual.yaml | 6 ++----
3 files changed, 7 insertions(+), 15 deletions(-)
rename data/grid5000/sites/rennes/servers/{dhcp-prod.json => dhcp.json} (64%)
diff --git a/data/grid5000/sites/rennes/servers/dhcp-prod.json b/data/grid5000/sites/rennes/servers/dhcp.json
similarity index 64%
rename from data/grid5000/sites/rennes/servers/dhcp-prod.json
rename to data/grid5000/sites/rennes/servers/dhcp.json
index 446f86eef3a..c11ed400986 100644
--- a/data/grid5000/sites/rennes/servers/dhcp-prod.json
+++ b/data/grid5000/sites/rennes/servers/dhcp.json
@@ -1,16 +1,13 @@
{
- "alias": [
- "dhcp"
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
- "ip": "172.16.111.117"
+ "ip": "172.17.111.117"
},
"default": {
"ip": "172.16.111.117"
}
},
"type": "server",
- "uid": "dhcp-prod"
+ "uid": "dhcp"
}
\ No newline at end of file
diff --git a/grid5000-all.json b/grid5000-all.json
index a20021f17c6..70a430630ab 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -205090,21 +205090,18 @@
"type": "server",
"uid": "csod"
},
- "dhcp-prod": {
- "alias": [
- "dhcp"
- ],
+ "dhcp": {
"kind": "virtual",
"network_adapters": {
"adm": {
- "ip": "172.16.111.117"
+ "ip": "172.17.111.117"
},
"default": {
"ip": "172.16.111.117"
}
},
"type": "server",
- "uid": "dhcp-prod"
+ "uid": "dhcp"
},
"dhcp-public": {
"kind": "virtual",
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index b820576d9e8..81fcf5ad565 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -11,11 +11,9 @@ helpdesk-global:
www:
kind: virtual
network_adapters: {default: {ip: 172.16.111.112}}
-dhcp-prod:
+dhcp:
kind: virtual
- alias:
- - dhcp
- network_adapters: {default: {ip: 172.16.111.117}, adm: {ip: 172.16.111.117}}
+ network_adapters: {default: {ip: 172.16.111.117}, adm: {ip: 172.17.111.117}}
ldap:
kind: virtual
network_adapters: {default: {ip: 172.16.111.120}}
--
GitLab