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

Split out a new LAN for building G

Browse source 
darcs-hash:20091118174104-61eff-b9dd767b23fcac868a8054bcaf7a26edc9ef9137.gz
This commit is contained in:
Stephane Glondu 2009-11-18 18:41:04 +01:00
parent e648f38651
commit d4fcd4ecc4
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gestion/config.py
View file

@ -374,12 +374,14 @@ NETs = { 'serveurs' : [ '138.231.136.0/28' ],
'138.231.138.0/24', '138.231.138.0/24',
'138.231.139.0/24', '138.231.139.0/24',
'138.231.140.0/22' ], '138.231.140.0/22' ],
'adh-g' : [ '138.231.151.0/24' ],
'bornes' : [ '138.231.148.0/24' ], 'bornes' : [ '138.231.148.0/24' ],
'vlan-adm' : [ '10.231.136.0/24' ], 'vlan-adm' : [ '10.231.136.0/24' ],
'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24', 'wifi-adh' : [ '138.231.144.0/24', '138.231.145.0/24', '138.231.146.0/24',
'138.231.147.0/24', '138.231.149.0/24', '138.231.150.0/24', '138.231.151.0/24'], '138.231.147.0/24', '138.231.149.0/24', '138.231.150.0/24' ],
'fil' : [ '138.231.136.0/21' ], 'fil' : [ '138.231.136.0/21' ],
'wifi': [ '138.231.148.0/21' ], 'wifi': [ '138.231.148.0/24', '138.231.149.0/24', '138.231.150.0/24', '138.231.151.0/24',
'138.231.152.0/24', '138.231.153.0/24', '138.231.154.0/24' ],
'gratuit': [ '10.42.0.0/16' ], 'gratuit': [ '10.42.0.0/16' ],
'personnel-ens': ['10.2.9.0/24' ], 'personnel-ens': ['10.2.9.0/24' ],
'all' : [ '138.231.136.0/21', '138.231.148.0/21' ] 'all' : [ '138.231.136.0/21', '138.231.148.0/21' ]

8
gestion/ldap_crans.py
View file

@ -2833,9 +2833,13 @@ Contactez nounou si la MAC est bien celle d'une carte.""", 3)
net = config.NETs['personnel-ens'] net = config.NETs['personnel-ens']
pool_ip = lister_ip_dispo('personnel-ens') pool_ip = lister_ip_dispo('personnel-ens')
elif not isinstance(proprio, Adherent) or proprio.adherentPayant(): elif not isinstance(proprio, Adherent) or proprio.adherentPayant():
proprio_subnet = 'adherents'
try: try:
net = config.NETs['adherents'] chbre = proprio.chbre()
pool_ip = lister_ip_dispo('adherents') if chbre and chbre[0] == 'G':
proprio_subnet = 'adh-g'
net = config.NETs[proprio_subnet]
pool_ip = lister_ip_dispo(proprio_subnet)
except: except:
raise RuntimeError(u'Impossible de trouver le réseau où placer la machine.') raise RuntimeError(u'Impossible de trouver le réseau où placer la machine.')
else: else: