From f19b8421f542810b72fcffaa923f7ba144c32910 Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Wed, 6 Nov 2019 15:18:00 +0100
Subject: [PATCH] [admin] Fixes aliases
---
data/grid5000/sites/grenoble/servers/puppet6.json | 4 +++-
data/grid5000/sites/lille/servers/puppet6.json | 4 +++-
data/grid5000/sites/luxembourg/servers/puppet6.json | 4 +++-
data/grid5000/sites/lyon/servers/puppet6.json | 4 +++-
data/grid5000/sites/nancy/servers/puppet6.json | 4 +++-
data/grid5000/sites/nantes/servers/puppet6.json | 4 +++-
data/grid5000/sites/sophia/servers/puppet6.json | 4 +++-
input/grid5000/sites/grenoble/servers/virtual.yaml | 2 +-
input/grid5000/sites/lille/servers/virtual.yaml | 2 +-
input/grid5000/sites/luxembourg/servers/virtual.yaml | 2 +-
input/grid5000/sites/lyon/servers/virtual.yaml | 2 +-
input/grid5000/sites/nancy/servers/virtual.yaml | 2 +-
input/grid5000/sites/nantes/servers/virtual.yaml | 2 +-
input/grid5000/sites/sophia/servers/virtual.yaml | 2 +-
14 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/data/grid5000/sites/grenoble/servers/puppet6.json b/data/grid5000/sites/grenoble/servers/puppet6.json
index 1e860f867c9..a4129a7073e 100644
--- a/data/grid5000/sites/grenoble/servers/puppet6.json
+++ b/data/grid5000/sites/grenoble/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/lille/servers/puppet6.json b/data/grid5000/sites/lille/servers/puppet6.json
index ba56c3774a8..0abd01a8d9f 100644
--- a/data/grid5000/sites/lille/servers/puppet6.json
+++ b/data/grid5000/sites/lille/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"adm": {
diff --git a/data/grid5000/sites/luxembourg/servers/puppet6.json b/data/grid5000/sites/luxembourg/servers/puppet6.json
index 5b55d8171fa..20cfff6ad4f 100644
--- a/data/grid5000/sites/luxembourg/servers/puppet6.json
+++ b/data/grid5000/sites/luxembourg/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/lyon/servers/puppet6.json b/data/grid5000/sites/lyon/servers/puppet6.json
index 198f165b157..f7960214f63 100644
--- a/data/grid5000/sites/lyon/servers/puppet6.json
+++ b/data/grid5000/sites/lyon/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nancy/servers/puppet6.json b/data/grid5000/sites/nancy/servers/puppet6.json
index 80276ebcf99..7f9e3fda876 100644
--- a/data/grid5000/sites/nancy/servers/puppet6.json
+++ b/data/grid5000/sites/nancy/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/nantes/servers/puppet6.json b/data/grid5000/sites/nantes/servers/puppet6.json
index 02f941c058f..7c035c4285f 100644
--- a/data/grid5000/sites/nantes/servers/puppet6.json
+++ b/data/grid5000/sites/nantes/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"default": {
diff --git a/data/grid5000/sites/sophia/servers/puppet6.json b/data/grid5000/sites/sophia/servers/puppet6.json
index 5d85b1e0ba5..dd75746302a 100644
--- a/data/grid5000/sites/sophia/servers/puppet6.json
+++ b/data/grid5000/sites/sophia/servers/puppet6.json
@@ -1,5 +1,7 @@
{
- "alias": "puppet",
+ "alias": [
+ "puppet"
+ ],
"kind": "virtual",
"network_adapters": {
"admin": {
diff --git a/input/grid5000/sites/grenoble/servers/virtual.yaml b/input/grid5000/sites/grenoble/servers/virtual.yaml
index 1f475c26da8..071ddb14d49 100644
--- a/input/grid5000/sites/grenoble/servers/virtual.yaml
+++ b/input/grid5000/sites/grenoble/servers/virtual.yaml
@@ -50,7 +50,7 @@ syslog:
network_adapters: {default: {ip: 172.16.31.115}}
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters: {default: {ip: 172.16.31.116}}
kavlan:
kind: virtual
diff --git a/input/grid5000/sites/lille/servers/virtual.yaml b/input/grid5000/sites/lille/servers/virtual.yaml
index 61ad7ec4345..f29bc8b8f69 100644
--- a/input/grid5000/sites/lille/servers/virtual.yaml
+++ b/input/grid5000/sites/lille/servers/virtual.yaml
@@ -14,7 +14,7 @@ ldap:
ip: 172.17.47.102
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters:
default:
ip: 172.16.47.103
diff --git a/input/grid5000/sites/luxembourg/servers/virtual.yaml b/input/grid5000/sites/luxembourg/servers/virtual.yaml
index c41f518d2db..904fd13f195 100644
--- a/input/grid5000/sites/luxembourg/servers/virtual.yaml
+++ b/input/grid5000/sites/luxembourg/servers/virtual.yaml
@@ -68,7 +68,7 @@ oar:
network_adapters: {default: {ip: 172.16.191.106}}
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters: {default: {ip: 172.16.191.100}}
puppet4:
kind: virtual
diff --git a/input/grid5000/sites/lyon/servers/virtual.yaml b/input/grid5000/sites/lyon/servers/virtual.yaml
index 50804c4db2d..aa8b9628c07 100644
--- a/input/grid5000/sites/lyon/servers/virtual.yaml
+++ b/input/grid5000/sites/lyon/servers/virtual.yaml
@@ -11,7 +11,7 @@ kadeploy:
network_adapters: {default: {ip: 172.16.63.103}, adm: {ip: 172.17.63.103}}
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters: {default: {ip: 172.16.63.104}}
supervision:
kind: virtual
diff --git a/input/grid5000/sites/nancy/servers/virtual.yaml b/input/grid5000/sites/nancy/servers/virtual.yaml
index a5a676fa004..7ff1e572ffa 100644
--- a/input/grid5000/sites/nancy/servers/virtual.yaml
+++ b/input/grid5000/sites/nancy/servers/virtual.yaml
@@ -27,7 +27,7 @@ apt-global:
network_adapters: {default: {ip: 172.16.79.109}}
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters: {default: {ip: 172.16.79.110}}
www:
kind: virtual
diff --git a/input/grid5000/sites/nantes/servers/virtual.yaml b/input/grid5000/sites/nantes/servers/virtual.yaml
index d9170c89d3c..d68a85a2359 100644
--- a/input/grid5000/sites/nantes/servers/virtual.yaml
+++ b/input/grid5000/sites/nantes/servers/virtual.yaml
@@ -118,7 +118,7 @@ oar:
ip: 172.16.207.111
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters:
default:
ip: 172.16.207.105
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index 7e49e8cd6ac..eafe94f3f48 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -136,7 +136,7 @@ oar:
ip: 172.17.143.104
puppet6:
kind: virtual
- alias: puppet
+ alias: [puppet]
network_adapters:
default:
ip: 172.16.143.103
--
GitLab