From 787df801d0a1f812a0f31bc0c3f6a5808c695e2a Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 29 Nov 2015 04:08:20 +0100
Subject: [PATCH] =?UTF-8?q?Le=20vlan=20appart=20est=20entierrement=20g?=
 =?UTF-8?q?=C3=A9r=C3=A9=20dans=20ldap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/python/ip.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/etc/python/ip.py b/etc/python/ip.py
index a481bc0..19f428f 100644
--- a/etc/python/ip.py
+++ b/etc/python/ip.py
@@ -15,6 +15,9 @@ def admipof(hostname):
 def wifiipof(hostname):
     return socket.gethostbyname(hostname + ".wifi.crans.org")
 
+def appt_ens_ipof(hostname):
+    return socket.gethostbyname(hostname + "-21.crans.org")
+
 def pubip():
     return pubipof(hostname)
 
@@ -24,6 +27,10 @@ def admip():
 def wifiip():
     return wifiipof(hostname)
 
+def appt_ens_ip():
+    return appt_ens_ipof(hostname)
+
+
 def ips_of_metadata(clients, vlan='adm'):
     """Renvoie la liste des IPs des machines de la liste ``clients``
     #TODO: sur le vlan ``vlan``
@@ -53,13 +60,11 @@ ip_vlan = {
     'sable' : {
         'vlan-radin' : '10.42.0.1',
         'vlan-accueil' : '10.51.0.1',
-        'vlan-ens' : '10.2.9.2',
         'vlan-isolement':'10.52.0.1'
     },
     'dhcp' : {
         'vlan-radin' : '10.42.0.34',
         'vlan-accueil' : '10.51.0.34',
-        'vlan-ens' : '10.2.9.34',
         'vlan-isolement':'10.52.0.34',
         'vlan-federez': '10.53.0.34'
     },
@@ -69,17 +74,14 @@ ip_vlan = {
     'isc' : {
         'vlan-radin' : '10.42.0.160',
         'vlan-accueil' : '10.51.0.160',
-        'vlan-ens' : '10.2.9.160',
         'vlan-isolement':'10.52.0.160',
         'vlan-federez': '10.53.0.160'
     },
     'routeur' : {
         'vlan-accueil' : '10.51.0.10',
-        'vlan-ens' : '10.2.9.10',
         'vlan-isolement':'10.52.0.10'
     },
     'titanic' : {'vlan-ens' : '10.2.9.1' },
-    'odlyd' : {'vlan-ens' : '10.2.9.4' },
     'pea' : {'vlan-federez' : '10.53.0.35' },
     'eap' : {'vlan-federez' : '10.53.0.11' },
   }
@@ -96,12 +98,6 @@ def accueilip():
     else:
         raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN d'accueil"
 
-def appt_ens_ip():
-    if has("vlan-ens"):
-        return ip_vlan[hostname]["vlan-ens"]
-    else:
-        raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN des appartements de l'ENS"
-
 def federezip():
     if has("vlan-federez"):
         return ip_vlan[hostname]["vlan-federez"]