From 2d4a2ded3cbb54a39b38efc2c4f7f4b1c620247a Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Wed, 30 May 2018 14:49:52 +0200
Subject: [PATCH] [lille] add dhcp server
---
data/grid5000/sites/lille/servers/dhcp.json | 13 +++++++++++++
data/grid5000/sites/lille/servers/dns.json | 3 ---
grid5000-all.json | 16 +++++++++++++---
input/grid5000/sites/lille/servers/virtual.yaml | 8 +++++++-
4 files changed, 33 insertions(+), 7 deletions(-)
create mode 100644 data/grid5000/sites/lille/servers/dhcp.json
diff --git a/data/grid5000/sites/lille/servers/dhcp.json b/data/grid5000/sites/lille/servers/dhcp.json
new file mode 100644
index 00000000000..525b978706a
--- /dev/null
+++ b/data/grid5000/sites/lille/servers/dhcp.json
@@ -0,0 +1,13 @@
+{
+ "kind": "virtual",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.47.111"
+ },
+ "default": {
+ "ip": "172.16.47.111"
+ }
+ },
+ "type": "server",
+ "uid": "dhcp"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/dns.json b/data/grid5000/sites/lille/servers/dns.json
index d13a91601d2..ac3db8d0358 100644
--- a/data/grid5000/sites/lille/servers/dns.json
+++ b/data/grid5000/sites/lille/servers/dns.json
@@ -1,7 +1,4 @@
{
- "alias": [
- "dhcp"
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
diff --git a/grid5000-all.json b/grid5000-all.json
index 77b80f31d0b..1b9d113bc4b 100644
--- a/grid5000-all.json
+++ b/grid5000-all.json
@@ -28978,10 +28978,20 @@
"type": "server",
"uid": "conman"
},
+ "dhcp": {
+ "kind": "virtual",
+ "network_adapters": {
+ "adm": {
+ "ip": "172.17.47.111"
+ },
+ "default": {
+ "ip": "172.16.47.111"
+ }
+ },
+ "type": "server",
+ "uid": "dhcp"
+ },
"dns": {
- "alias": [
- "dhcp"
- ],
"kind": "virtual",
"network_adapters": {
"adm": {
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 5f29d4f393c..406a1736862 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -1,6 +1,5 @@
dns:
kind: virtual
- alias: [dhcp]
network_adapters:
default:
ip: 172.16.47.101
@@ -75,6 +74,13 @@ mail:
ip: 172.16.47.110
adm:
ip: 172.17.47.110
+dhcp:
+ kind: virtual
+ network_adapters:
+ default:
+ ip: 172.16.47.111
+ adm:
+ ip: 172.17.47.111
access:
kind: virtual
network_adapters:
--
GitLab