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 446f86eef3afee960b66c48efe804f13c51a1a39..c11ed400986ce8229a11b8e3eb0aeff6c63f2356 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 a20021f17c613ee8188fd643f20bc865f9c5b79b..70a430630ab0e48d70b6b90906a7588e637adce1 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 b820576d9e8acbb50c7ac5ba47ec8e145d153222..81fcf5ad56553e7159e42ff4768dd3666bd213cd 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}}