From 16bc76d995b50d96b3381bca8598298a72ac416e Mon Sep 17 00:00:00 2001 From: Olivier Huber Date: Tue, 14 Apr 2009 00:01:44 +0200 Subject: [PATCH] [./gestion/gen_confs/dhcpd.py] Ces machines n'existent plus darcs-hash:20090413220144-8fbb1-8cc05665f4bb8b03d5435cdf06be1d418a359e11.gz --- gestion/gen_confs/dhcpd.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gestion/gen_confs/dhcpd.py b/gestion/gen_confs/dhcpd.py index de7078ba..86cd9321 100644 --- a/gestion/gen_confs/dhcpd.py +++ b/gestion/gen_confs/dhcpd.py @@ -161,13 +161,7 @@ subnet %(network)s netmask %(netmask)s { t = 0 for net in self.reseaux.keys() : if AddrInNet(machine.ip(),net) : - # choix du template en fonction de la machine - if machine.nom() in ['momo.crans.org']: - host_template = self.host_template_ltsp_i386 - elif machine.nom() in ['bulle3.crans.org','bulle2.crans.org','bulle10.crans.org','bulle12.crans.org']: - host_template = self.host_template_ltsp_powerpc - else: - host_template = self.host_template + host_template = self.host_template # variable pour remplir le template d = { 'nom' : machine.nom().split('.')[0] , 'mac' : machine.mac() , 'ip' : machine.ip() } try : hosts[net] += host_template % d