diff --git a/Base/dom0.xml b/Base/dom0.xml index 391500b..a399ac7 100644 --- a/Base/dom0.xml +++ b/Base/dom0.xml @@ -25,5 +25,6 @@ + diff --git a/Cfg/etc/xen/dhcp/dhcp b/Cfg/etc/xen/dhcp/dhcp new file mode 100644 index 0000000..93d6e24 --- /dev/null +++ b/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') + ] diff --git a/Cfg/etc/xen/routeur/routeur b/Cfg/etc/xen/routeur/routeur new file mode 100644 index 0000000..a516a28 --- /dev/null +++ b/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') + ] diff --git a/Metadata/clients.xml b/Metadata/clients.xml index 32d2cdd..f202bdc 100644 --- a/Metadata/clients.xml +++ b/Metadata/clients.xml @@ -47,6 +47,7 @@ + diff --git a/Metadata/groups.xml b/Metadata/groups.xml index f6e9160..0be7198 100644 --- a/Metadata/groups.xml +++ b/Metadata/groups.xml @@ -393,6 +393,15 @@ + + + + + + + + diff --git a/etc/python/ip.py b/etc/python/ip.py index c55ac51..5c35d48 100644 --- a/etc/python/ip.py +++ b/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' }, }