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

[iscsi] Deux baies, suite et fin

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-03-10 01:14:44 +01:00
parent 01eec6b164
commit b843c80153
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gestion/iscsi/get_volume_mapping.py
View file

@ -47,9 +47,9 @@ def get_mapping(baie_name):
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Fichier de mapping lun -> nom de volume # Fichier de mapping lun -> nom de volume
# #
# Ce fichier est généré par %s # Ce fichier est généré par %s %s
map = { map = {
""" % (sys.argv[0], baie)).encode(coding)) """ % (sys.argv[0], baie)).encode(coding))
for lun, name in map: for lun, name in map:

4
gestion/iscsi/udev_get_iscsi_name.py
View file

@ -15,8 +15,8 @@ import os
sys.path.append("/usr/scripts/gestion") sys.path.append("/usr/scripts/gestion")
from config import ISCSI_MAP_FILE from config import ISCSI_MAP_FILE
def getname(device): def getname(device, baie):
map_file = ISCSI_MAP_FILE map_file = ISCSI_MAP_FILE % (baie,)
if not device.isalpha(): if not device.isalpha():
block = "".join([i for i in device if i.isalpha()]) block = "".join([i for i in device if i.isalpha()])

6
gestion/iscsi/udev_update_symlinks.py
View file

@ -27,9 +27,13 @@ def store_iscsi_volumes():
for line in state: for line in state:
line = line.replace('\n', '') line = line.replace('\n', '')
if line.startswith('ip-'): if line.startswith('ip-'):
if "storage.p2000g3" in line:
baie = "nols"
else:
baie = "slon"
device = os.readlink(PATH+line) # de la forme ../../sdb42 device = os.readlink(PATH+line) # de la forme ../../sdb42
device = device.rsplit('/', 1)[1] device = device.rsplit('/', 1)[1]
symlink = 'iscsi_' + ugin.getname(device) symlink = 'iscsi_' + ugin.getname(device, baie)
if line.rsplit('-', 1)[1][0:4] == "part": if line.rsplit('-', 1)[1][0:4] == "part":
lun = line.rsplit('-', 2)[1] lun = line.rsplit('-', 2)[1]
else: else: