diff --git a/dev/input/grid5000/sites/grenoble/grenoble.yaml b/dev/input/grid5000/sites/grenoble/grenoble.yaml index 9b8cc571323b13521bf2e77c6f70d63a9a9ef458..5a7a88d4618971750708e1e52ac1c0dd84c6b3a2 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 2e3da79e55d2d925bb16e914db8fea5a6622a858..85239bd20f7c6b909c65954814acbed2735a0c3e 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 523f1084705ecef65eaaba37b8a8cc0686f9dca3..14dae5d918124a6c4a9a700d2398f4516d6fd89a 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 d12605ab7336a3bf6422c312d3ac6492a75a8e17..1fffcafe4a9875df8616daef8df90e040b31e00a 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 3ea158c9a8bff7b31a7c4b1fb30ae79e78333cbf..4ed169c8f731fa182c729e335d45c95b2547b267 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 55accf4f7609544977f65570157ed9a239236f14..6d535dfd4e99bf5a0c1a35246f685a7436930af4 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 65a7daf8a764783a47da9e2c938aa8df6904a4af..7ada7b84072b3795f89e2b0bd439db057d7390b0 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 cd4b5edbe16bbff48829af4ba6c5fc796025f13d..492d1e29f632ef4b04befce5be1f63971d838fae 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 451416d8a4e7a01ff3d057a6aef6f4a1ef900013..062e3f0d255adbc12d71873e94f5724efbaed035 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 e29d8d0dea328d29fbe8e3f5929a3645330461d4..22b408ec63b670226e09600c3c9550c793921602 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.