crans/crans_bcfg2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Le vlan appart est entierrement géré dans ldap

Browse source
This commit is contained in:
Gabriel Detraz 2015-11-29 04:08:20 +01:00
parent d241653182
commit 787df801d0
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
etc/python/ip.py
View file

@ -15,6 +15,9 @@ def admipof(hostname):
def wifiipof(hostname): def wifiipof(hostname):
return socket.gethostbyname(hostname + ".wifi.crans.org") return socket.gethostbyname(hostname + ".wifi.crans.org")
def appt_ens_ipof(hostname):
return socket.gethostbyname(hostname + "-21.crans.org")
def pubip(): def pubip():
return pubipof(hostname) return pubipof(hostname)
@ -24,6 +27,10 @@ def admip():
def wifiip(): def wifiip():
return wifiipof(hostname) return wifiipof(hostname)
def appt_ens_ip():
return appt_ens_ipof(hostname)
def ips_of_metadata(clients, vlan='adm'): def ips_of_metadata(clients, vlan='adm'):
"""Renvoie la liste des IPs des machines de la liste ``clients`` """Renvoie la liste des IPs des machines de la liste ``clients``
#TODO: sur le vlan ``vlan`` #TODO: sur le vlan ``vlan``
@ -53,13 +60,11 @@ ip_vlan = {
'sable' : { 'sable' : {
'vlan-radin' : '10.42.0.1', 'vlan-radin' : '10.42.0.1',
'vlan-accueil' : '10.51.0.1', 'vlan-accueil' : '10.51.0.1',
'vlan-ens' : '10.2.9.2',
'vlan-isolement':'10.52.0.1' 'vlan-isolement':'10.52.0.1'
}, },
'dhcp' : { 'dhcp' : {
'vlan-radin' : '10.42.0.34', 'vlan-radin' : '10.42.0.34',
'vlan-accueil' : '10.51.0.34', 'vlan-accueil' : '10.51.0.34',
'vlan-ens' : '10.2.9.34',
'vlan-isolement':'10.52.0.34', 'vlan-isolement':'10.52.0.34',
'vlan-federez': '10.53.0.34' 'vlan-federez': '10.53.0.34'
}, },
@ -69,17 +74,14 @@ ip_vlan = {
'isc' : { 'isc' : {
'vlan-radin' : '10.42.0.160', 'vlan-radin' : '10.42.0.160',
'vlan-accueil' : '10.51.0.160', 'vlan-accueil' : '10.51.0.160',
'vlan-ens' : '10.2.9.160',
'vlan-isolement':'10.52.0.160', 'vlan-isolement':'10.52.0.160',
'vlan-federez': '10.53.0.160' 'vlan-federez': '10.53.0.160'
}, },
'routeur' : { 'routeur' : {
'vlan-accueil' : '10.51.0.10', 'vlan-accueil' : '10.51.0.10',
'vlan-ens' : '10.2.9.10',
'vlan-isolement':'10.52.0.10' 'vlan-isolement':'10.52.0.10'
}, },
'titanic' : {'vlan-ens' : '10.2.9.1' }, 'titanic' : {'vlan-ens' : '10.2.9.1' },
'odlyd' : {'vlan-ens' : '10.2.9.4' },
'pea' : {'vlan-federez' : '10.53.0.35' }, 'pea' : {'vlan-federez' : '10.53.0.35' },
'eap' : {'vlan-federez' : '10.53.0.11' }, 'eap' : {'vlan-federez' : '10.53.0.11' },
} }
@ -96,12 +98,6 @@ def accueilip():
else: else:
raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN d'accueil" raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN d'accueil"
def appt_ens_ip():
if has("vlan-ens"):
return ip_vlan[hostname]["vlan-ens"]
else:
raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN des appartements de l'ENS"
def federezip(): def federezip():
if has("vlan-federez"): if has("vlan-federez"):
return ip_vlan[hostname]["vlan-federez"] return ip_vlan[hostname]["vlan-federez"]