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

vlan 12 : dhcp, eap, pea, isc, fct vlan federez dans ip.py pour les int

Browse source
This commit is contained in:
Gabriel Detraz 2015-05-13 21:44:41 +02:00 • committed by Pierre-Elliott Bécue
parent 7d99d9d2b4
commit d3dd2bf0d3
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Metadata/groups.xml
View file

@ -286,6 +286,7 @@
<Group name="db-replicat"/>
<Group name="nas-auth-server"/>
<Group name="vlan-wifi"/>
<Group name="vlan-federez"/>
<Group name="non-vlan-adherent"/>
</Group>
@ -296,6 +297,7 @@
<Group name="db-replicat"/>
<Group name="nas-auth-server"/>
<Group name="vlan-wifi"/>
<Group name="vlan-federez"/>
<Group name="non-vlan-adherent"/>
</Group>
@ -388,6 +390,7 @@
<Group name="crans-vm-wheezy"/>
<Group name="nas-auth-server"/>
<Group name="non-vlan-adherent"/>
<Group name="vlan-wifi"/>
<Group name="db-replicat"/>
</Group>
@ -434,6 +437,7 @@
<Group name="vlan-isolement"/>
<Group name="vlan-ens"/>
<Group name="vlan-wifi"/>
<Group name="vlan-federez"/>
<Group name="dhcp-server-primary"/>
</Group>
@ -445,6 +449,7 @@
<Group name="vlan-isolement"/>
<Group name="vlan-ens"/>
<Group name="vlan-wifi"/>
<Group name="vlan-federez"/>
<Group name="dhcp-server-secondary"/>
</Group>

14
etc/python/ip.py
View file

@ -60,7 +60,8 @@ ip_vlan = {
'vlan-radin' : '10.42.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'
},
'nat64' : {
'vlan-radin' : '10.42.0.164',
@ -69,7 +70,8 @@ ip_vlan = {
'vlan-radin' : '10.42.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'
},
'routeur' : {
'vlan-accueil' : '10.51.0.10',
@ -78,6 +80,8 @@ ip_vlan = {
},
'titanic' : {'vlan-ens' : '10.2.9.1' },
'odlyd' : {'vlan-ens' : '10.2.9.4' },
'pea' : {'vlan-federez' : '10.53.0.3' },
'eap' : {'vlan-federez' : '10.53.0.11' },
}
def radinip():
@ -98,6 +102,12 @@ def appt_ens_ip():
else:
raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN des appartements de l'ENS"
def federezip():
if has("vlan-federez"):
return ip_vlan[hostname]["vlan-federez"]
else:
raise NotImplementedError, "Ce serveur n'a rien a faire sur le VLAN federez"
def isolementip():
if has("vlan-isolement"):
return ip_vlan[hostname]["vlan-isolement"]