From 99eef8784bb124c0372b8f116f065b6381ec09a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Gaidamour?= <jeremie.gaidamour@inria.fr>
Date: Tue, 26 Apr 2016 17:00:59 +0200
Subject: [PATCH] [all] Added frontend ip
---
dev/input/grid5000/sites/grenoble/grenoble.yaml | 1 +
dev/input/grid5000/sites/lille/lille.yaml | 1 +
dev/input/grid5000/sites/luxembourg/luxembourg.yaml | 1 +
dev/input/grid5000/sites/lyon/lyon.yaml | 1 +
dev/input/grid5000/sites/nancy/nancy.yaml | 1 +
dev/input/grid5000/sites/nantes/nantes.yaml | 1 +
dev/input/grid5000/sites/reims/reims.yaml | 1 +
dev/input/grid5000/sites/rennes/rennes.yaml | 1 +
dev/input/grid5000/sites/sophia/sophia.yaml | 1 +
dev/puppet/templates/bind-header.erb | 2 +-
10 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dev/input/grid5000/sites/grenoble/grenoble.yaml b/dev/input/grid5000/sites/grenoble/grenoble.yaml
index 9b8cc571323..5a7a88d4618 100644
--- a/dev/input/grid5000/sites/grenoble/grenoble.yaml
+++ b/dev/input/grid5000/sites/grenoble/grenoble.yaml
@@ -19,6 +19,7 @@ storage5k: false
# - default
# - admin
production: true
+frontend_ip: 172.16.31.101
g5ksubnet:
network: 10.132.0.0/14
diff --git a/dev/input/grid5000/sites/lille/lille.yaml b/dev/input/grid5000/sites/lille/lille.yaml
index 2e3da79e55d..85239bd20f7 100644
--- a/dev/input/grid5000/sites/lille/lille.yaml
+++ b/dev/input/grid5000/sites/lille/lille.yaml
@@ -14,6 +14,7 @@ virt_ip_range: 10.136.0.0/14
renater_ip: 192.168.4.18
storage5k: false
production: true
+frontend_ip: 172.16.47.106
g5ksubnet:
network: 10.136.0.0/14
diff --git a/dev/input/grid5000/sites/luxembourg/luxembourg.yaml b/dev/input/grid5000/sites/luxembourg/luxembourg.yaml
index 523f1084705..14dae5d9181 100644
--- a/dev/input/grid5000/sites/luxembourg/luxembourg.yaml
+++ b/dev/input/grid5000/sites/luxembourg/luxembourg.yaml
@@ -18,6 +18,7 @@ production: true
#queues:
# - default
# - admin
+frontend_ip: 172.16.191.109
g5ksubnet:
network: 10.172.0.0/14
diff --git a/dev/input/grid5000/sites/lyon/lyon.yaml b/dev/input/grid5000/sites/lyon/lyon.yaml
index d12605ab733..1fffcafe4a9 100644
--- a/dev/input/grid5000/sites/lyon/lyon.yaml
+++ b/dev/input/grid5000/sites/lyon/lyon.yaml
@@ -15,6 +15,7 @@ virt_ip_range: 10.140.0.0/14
renater_ip: 192.168.4.13
storage5k: true
production: true
+frontend_ip: 172.16.63.101
#queues:
# - default
# - admin
diff --git a/dev/input/grid5000/sites/nancy/nancy.yaml b/dev/input/grid5000/sites/nancy/nancy.yaml
index 3ea158c9a8b..4ed169c8f73 100644
--- a/dev/input/grid5000/sites/nancy/nancy.yaml
+++ b/dev/input/grid5000/sites/nancy/nancy.yaml
@@ -16,6 +16,7 @@ virt_ip_range: 10.144.0.0/14
renater_ip: 192.168.4.14
storage5k: true
production: true
+frontend_ip: 172.16.79.101
# Admin laptops
laptops:
diff --git a/dev/input/grid5000/sites/nantes/nantes.yaml b/dev/input/grid5000/sites/nantes/nantes.yaml
index 55accf4f760..6d535dfd4e9 100644
--- a/dev/input/grid5000/sites/nantes/nantes.yaml
+++ b/dev/input/grid5000/sites/nantes/nantes.yaml
@@ -18,6 +18,7 @@ production: true
#queues:
# - default
# - admin
+frontend_ip: 172.16.207.100
g5ksubnet:
network: 10.176.0.0/14
diff --git a/dev/input/grid5000/sites/reims/reims.yaml b/dev/input/grid5000/sites/reims/reims.yaml
index 65a7daf8a76..7ada7b84072 100644
--- a/dev/input/grid5000/sites/reims/reims.yaml
+++ b/dev/input/grid5000/sites/reims/reims.yaml
@@ -13,6 +13,7 @@ kavlan_ip_range: 10.36.0.0/14
virt_ip_range: 10.168.0.0/14
storage5k: false
production: true
+frontend_ip: 172.16.175.100
g5ksubnet:
network: 10.168.0.0/14
diff --git a/dev/input/grid5000/sites/rennes/rennes.yaml b/dev/input/grid5000/sites/rennes/rennes.yaml
index cd4b5edbe16..492d1e29f63 100644
--- a/dev/input/grid5000/sites/rennes/rennes.yaml
+++ b/dev/input/grid5000/sites/rennes/rennes.yaml
@@ -14,6 +14,7 @@ virt_ip_range: 10.156.0.0/14
renater_ip: 192.168.4.19
storage5k: true
production: true
+frontend_ip: 172.16.111.106
# needed by puppet generators
servers:
diff --git a/dev/input/grid5000/sites/sophia/sophia.yaml b/dev/input/grid5000/sites/sophia/sophia.yaml
index 451416d8a4e..062e3f0d255 100644
--- a/dev/input/grid5000/sites/sophia/sophia.yaml
+++ b/dev/input/grid5000/sites/sophia/sophia.yaml
@@ -14,6 +14,7 @@ virt_ip_range: 10.164.0.0/14
renater_ip: 192.168.4.12
storage5k: true
production: true
+frontend_ip: 172.16.143.106
g5ksubnet:
network: 10.164.0.0/14
diff --git a/dev/puppet/templates/bind-header.erb b/dev/puppet/templates/bind-header.erb
index e29d8d0dea3..22b408ec63b 100644
--- a/dev/puppet/templates/bind-header.erb
+++ b/dev/puppet/templates/bind-header.erb
@@ -8,5 +8,5 @@ $TTL 3h
@ IN NS dns.grid5000.fr.<%
if output_file == "#{site_uid}.db" %>
-@ IN A <%= '172.16.79.101' %><% end %>
+@ IN A <%= site['frontend_ip'] %><% end %>
@ MX 10 mail.nancy.grid5000.fr.
--
GitLab