[groups.xml,interfaces,ip.py] Ajout de sable sur les vlan 21 sur bcfg2

Ignore-this: c272a355668a2beb50b1dd9ac359b119

darcs-hash:20121005151003-3a55a-8e33c595ee2682c38e266dd9893ade14615c4183.gz

Metadata/groups.xml

@@ -53,6 +53,7 @@
     <Group name="vlan-radin"/>
     <Group name="vlan-isolement"/>
     <Group name="firmware-bnx2"/>
+    <Group name="vlan-ens"/>
   </Group>
 
   <Group name="gordon"

Python/etc/network/interfaces

@@ -31,8 +31,7 @@ iface %(interface)s inet static
     gateway 138.231.136.4
     dns-nameservers 138.231.136.98 138.231.136.9
     dns-search crans.org
-    post-up ip r add 138.231.144.0/21 dev %(interface)s via 138.231.136.247 src %(ip)s"""\
-        % { 'interface': interface, 'ip': pubip() }
+    post-up ip r add 138.231.144.0/21 dev %(interface)s via 138.231.136.247 src %(ip)s""" % { 'interface': interface, 'ip': pubip() }
     
         for line in additionnals:
             print "   ", line

etc/python/ip.py

@@ -40,7 +40,10 @@ def accueilip():
 
 def appt_ens_ip():
     if has("vlan-ens"):
-        return '10.2.9.1'
+        if hostname == "titanic":
+           return '10.2.9.1'
+        elif hostname == "sable":
+           return '10.2.9.2'
     else:
         raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN des appartements de l'ENS"