From a4506a6092a9ea64615e7910b601b207e481b614 Mon Sep 17 00:00:00 2001 From: Olivier Huber Date: Sun, 29 Mar 2009 20:11:44 +0200 Subject: [PATCH] Ajout du vlan isolement dans Bcfg2 darcs-hash:20090329181144-8fbb1-e934e85532184bee0eb3389ccc88780cdf8984f4.gz --- Python/etc/network/interfaces | 10 ++++++++++ etc/python/ip.py | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces index 2dc18e9..6bb65fd 100644 --- a/Python/etc/network/interfaces +++ b/Python/etc/network/interfaces @@ -61,6 +61,16 @@ iface %(interface)s inet static netmask 255.255.255.0 broadcast 10.2.9.255 mtu 1496""" % { 'interface': interface, 'ip': appt_ens_ip() } + + elif mode == "isolement": + print """auto %(interface)s +iface %(interface)s inet static + address %(ip)s + network 10.52.0.0 + netmask 255.255.0.0 + broadcast 10.52.255.255 + mtu 1496""" % { 'interface': interface, 'ip': isolementip() } + else: raise NotImplementedError, "Mode de réseau inconnu : %s" % mode diff --git a/etc/python/ip.py b/etc/python/ip.py index 897e44f..7b3840e 100644 --- a/etc/python/ip.py +++ b/etc/python/ip.py @@ -37,3 +37,9 @@ def appt_ens_ip(): return '10.2.9.1' else: raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN des appartements de l'ENS" + +def isolementip(): + if has("vlan-isolement"): + return '10.52.0.1' + else: + raise NotImplementedError, "Ce serveur n'a rien à faire sur le VLAN isolement"