[ip.py,groups.xml,clients.xml,dom0.xml,routeur,dhcp] Ajout d'un dom0 routeur

Ignore-this: 65c00a51e46bae275c666b3d8b824917
et oubli d'ajout de la conf de dhcp

darcs-hash:20121101164149-3a55a-5ce57156321acf4f944eaa3962c4d7467debb1c0.gz

Base/dom0.xml

@@ -25,5 +25,6 @@
     <ConfigFile name="/etc/xen/sogo"/>
     <ConfigFile name="/etc/xen/dhcp"/>
     <ConfigFile name="/etc/xen/log"/>
+    <ConfigFile name="/etc/xen/routeur"/>
   </Group>
 </Base>

Cfg/etc/xen/dhcp/dhcp

@@ -0,0 +1,17 @@
+# -*- coding: utf-8; mode: python -*-
+
+execfile("/etc/xen/common_squeeze.py")
+
+name = "dhcp"
+
+disk = [ vol(name, "slash", "xvda"),
+         vol(name, "swap", "xvdb") ]
+
+vif = [ pub('02:64:68:63:70:01'),
+        adm('02:64:68:63:70:02'),
+	wifi('02:64:68:63:70:03'),
+	gratuit('02:64:68:63:70:06'),
+	accueil('02:64:68:63:70:07'),
+	isolement('02:64:68:63:70:09'),
+	appt_ens('02:64:68:63:70:21')
+ ]

Cfg/etc/xen/routeur/routeur

@@ -0,0 +1,15 @@
+# -*- coding: utf-8; mode: python -*-
+
+execfile("/etc/xen/common_squeeze.py")
+
+name = "routeur"
+
+disk = [ vol(name, "slash", "xvda"),
+         vol(name, "swap", "xvdb") ]
+
+vif = [ pub('02:72:6f:75:74:01'),
+        adm('02:72:6f:75:74:02'),
+	accueil('02:72:6f:75:74:07'),
+	isolement('02:72:6f:75:74:09'),
+	appt_ens('02:72:6f:75:74:21')
+ ]

Metadata/clients.xml

@@ -47,6 +47,7 @@
   <Client name="sogo.adm.crans.org" profile="sogo" pingable="Y" pingtime="1342471850.94"/>
   <Client name="dhcp.adm.crans.org" profile="dhcp"/>
   <Client name="log.adm.crans.org" profile="log"/>
+  <Client name="routeur.adm.crans.org" profile="routeur"/>
 
   <!-- Containers OpenVZ -->
   <Client name="notyetbroken.adm.crans.org" profile="notyetbroken" pingable="N" pingtime="1252769390.14"/>

Metadata/groups.xml

@@ -393,6 +393,15 @@
     <Group name="pgsql-server"/>
   </Group>
 
+  <Group name="routeur"
+        profile="true">
+    <Group name="crans-squeeze"/>
+    <Group name="domu"/>
+    <Group name="vlan-accueil" />
+    <Group name="vlan-isolement"/>
+    <Group name="vlan-ens"/>
+  </Group>
+
   <!-- profile de test -->
 
   <Group name="bcfg2tmp0" profile="true">

etc/python/ip.py

@@ -39,6 +39,11 @@ ip_vlan = {
         'vlan-ens' : '10.2.9.34',
         'vlan-isolement':'10.52.0.34'
     },
+    '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' },
     'komaz' : {'vlan-ens' : '10.2.9.4' },
   }