diff --git a/data/grid5000/sites/grenoble/servers/puppet4.json b/data/grid5000/sites/grenoble/servers/puppet4.json
deleted file mode 100644
index 7e39389356a39212f179f0439a13f71e3cab0a17..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.31.155"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/servers/puppet4.json b/data/grid5000/sites/lille/servers/puppet4.json
deleted file mode 100644
index 265c9a83a2bf08a4cf9191a0a7131942e4c92e4e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.47.142"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/servers/puppet4.json b/data/grid5000/sites/luxembourg/servers/puppet4.json
deleted file mode 100644
index 708adaec12a9e2974812376adeee692194ce7760..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/luxembourg/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.191.112"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/servers/puppet4.json b/data/grid5000/sites/lyon/servers/puppet4.json
deleted file mode 100644
index 9788f99dab9478125b8fc17bda7950cffd1c70f9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.63.130"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/servers/puppet4.json b/data/grid5000/sites/nancy/servers/puppet4.json
deleted file mode 100644
index fa7a720a671b00f4d7496b6ddffd091c70735203..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.79.146"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/servers/puppet4.json b/data/grid5000/sites/nantes/servers/puppet4.json
deleted file mode 100644
index 31077cfeb9caadd630098f52038797aa491291d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nantes/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.207.126"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/servers/puppet4.json b/data/grid5000/sites/rennes/servers/puppet4.json
deleted file mode 100644
index 0d07dbcb52a670001db132262f6071643a3c4ca6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.111.143"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/puppet4.json b/data/grid5000/sites/sophia/servers/puppet4.json
deleted file mode 100644
index a1685cb8240b9fbf8328a3c223bdcd43a1cfd3f6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/servers/puppet4.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "virtual",
- "network_adapters": {
- "default": {
- "ip": "172.16.143.114"
- }
- },
- "type": "server",
- "uid": "puppet4"
-}
\ 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 071ddb14d499ec97a3bf877184cd9f24eb8879c3..b4ced7e531f0162adcd5992908d838a091f417a0 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -82,9 +82,6 @@ mu2:
kwapi:
kind: virtual
network_adapters: {default: {ip: 172.16.31.154}}
-puppet4:
- kind: virtual
- network_adapters: {default: {ip: 172.16.31.155}}
supervision2:
kind: virtual
network_adapters: {default: {ip: 172.16.31.156}}
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index a06efd223d0f90a04c0352539c7c7a2ad03ebcf0..b4732953cbfdfc0d7f55b1a527129d8325b98658 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -174,11 +174,6 @@ kwapi:
network_adapters:
default:
ip: 172.16.47.140
-puppet4:
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.47.142
supervision2:
kind: virtual
network_adapters:
diff --git a/input/grid5000/sites/luxembourg/servers/virtual.yaml b/input/grid5000/sites/luxembourg/servers/virtual.yaml
index 904fd13f195bf52844e93497c171d233704d4ab2..5af8ad54aef6c248f9db99a22f745d2146130fef 100644
--- a/input/grid5000/sites/luxembourg/servers/virtual.yaml
+++ b/input/grid5000/sites/luxembourg/servers/virtual.yaml
@@ -70,9 +70,6 @@ puppet6:
kind: virtual
alias: [puppet]
network_adapters: {default: {ip: 172.16.191.100}}
-puppet4:
- kind: virtual
- network_adapters: {default: {ip: 172.16.191.112}}
supervision:
kind: virtual
alias: [nagios, munin]
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index aa8b9628c07b56af9625f63ce0549edeb9cac227..0f185a5cf4ddeb583d554b6a7b6d400bbf261f12 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -77,9 +77,6 @@ kadeploy-devel:
kwapi:
kind: virtual
network_adapters: {default: {ip: 172.16.63.127}}
-puppet4:
- kind: virtual
- network_adapters: {default: {ip: 172.16.63.130}}
nat:
kind: virtual
alias: [access]
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index 7ff1e572ffa520584102a145565321fb8914ad47..f0f4ca8211f29ad8ee42bd5f0e11b5b4b43bbfb1 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -80,9 +80,6 @@ ganglia:
supervision2:
kind: virtual
network_adapters: {default: {ip: 172.16.79.145}}
-puppet4:
- kind: virtual
- network_adapters: {default: {ip: 172.16.79.146}}
icinga:
kind: virtual
network_adapters: {default: {ip: 172.16.79.147}}
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index d68a85a23590b95c8a062bf374f55e1123ffd5ca..f6957c0b18174dfd7118e5db80d921d39da5a0be 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -122,11 +122,6 @@ puppet6:
network_adapters:
default:
ip: 172.16.207.105
-puppet4:
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.207.126
supervision:
alias:
- munin
diff --git a/input/grid5000/sites/rennes/servers/virtual.yaml b/input/grid5000/sites/rennes/servers/virtual.yaml
index 78987aeabbba89a222802386b3add70949e7534c..1ccf4e4842794096d55078d0d4e7b75738c6c823 100644
--- a/input/grid5000/sites/rennes/servers/virtual.yaml
+++ b/input/grid5000/sites/rennes/servers/virtual.yaml
@@ -113,9 +113,6 @@ api-server-devel:
stats:
kind: virtual
network_adapters: {default: {ip: 172.16.111.131}}
-puppet4:
- kind: virtual
- network_adapters: {default: {ip: 172.16.111.143}}
supervision2:
kind: virtual
network_adapters: {default: {ip: 172.16.111.145}}
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index cc6c999016b0ef2eda62d709c764ec6bd03a53ab..88b36530e7cfbeec237eec0a372b872a950ef6f5 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -13,11 +13,6 @@ api-proxy:
ip: 172.16.143.111
admin:
ip: 172.17.143.111
-puppet4:
- kind: virtual
- network_adapters:
- default:
- ip: 172.16.143.114
api-server-devel:
kind: virtual
network_adapters: