From 47261a8d8e8e0cd2d0854c6bcc6a1ec9d65c8407 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Mon, 2 Dec 2019 09:28:04 +0100
Subject: [PATCH] [admin] Remove Puppet 4 server VMs
---
data/grid5000/sites/grenoble/servers/puppet4.json | 10 ----------
data/grid5000/sites/lille/servers/puppet4.json | 10 ----------
data/grid5000/sites/luxembourg/servers/puppet4.json | 10 ----------
data/grid5000/sites/lyon/servers/puppet4.json | 10 ----------
data/grid5000/sites/nancy/servers/puppet4.json | 10 ----------
data/grid5000/sites/nantes/servers/puppet4.json | 10 ----------
data/grid5000/sites/rennes/servers/puppet4.json | 10 ----------
data/grid5000/sites/sophia/servers/puppet4.json | 10 ----------
input/grid5000/sites/grenoble/servers/virtual.yaml | 3 ---
input/grid5000/sites/lille/servers/virtual.yaml | 5 -----
input/grid5000/sites/luxembourg/servers/virtual.yaml | 3 ---
input/grid5000/sites/lyon/servers/virtual.yaml | 3 ---
input/grid5000/sites/nancy/servers/virtual.yaml | 3 ---
input/grid5000/sites/nantes/servers/virtual.yaml | 5 -----
input/grid5000/sites/rennes/servers/virtual.yaml | 3 ---
input/grid5000/sites/sophia/servers/virtual.yaml | 5 -----
16 files changed, 110 deletions(-)
delete mode 100644 data/grid5000/sites/grenoble/servers/puppet4.json
delete mode 100644 data/grid5000/sites/lille/servers/puppet4.json
delete mode 100644 data/grid5000/sites/luxembourg/servers/puppet4.json
delete mode 100644 data/grid5000/sites/lyon/servers/puppet4.json
delete mode 100644 data/grid5000/sites/nancy/servers/puppet4.json
delete mode 100644 data/grid5000/sites/nantes/servers/puppet4.json
delete mode 100644 data/grid5000/sites/rennes/servers/puppet4.json
delete mode 100644 data/grid5000/sites/sophia/servers/puppet4.json
diff --git a/data/grid5000/sites/grenoble/servers/puppet4.json b/data/grid5000/sites/grenoble/servers/puppet4.json
deleted file mode 100644
index 7e39389356a..00000000000
--- 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 265c9a83a2b..00000000000
--- 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 708adaec12a..00000000000
--- 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 9788f99dab9..00000000000
--- 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 fa7a720a671..00000000000
--- 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 31077cfeb9c..00000000000
--- 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 0d07dbcb52a..00000000000
--- 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 a1685cb8240..00000000000
--- 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 071ddb14d49..b4ced7e531f 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 a06efd223d0..b4732953cbf 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 904fd13f195..5af8ad54aef 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 aa8b9628c07..0f185a5cf4d 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 7ff1e572ffa..f0f4ca8211f 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 d68a85a2359..f6957c0b181 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 78987aeabbb..1ccf4e48427 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 cc6c999016b..88b36530e7c 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:
--
GitLab