git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[nodemanager.git]
/
plugins
/
rawdisk.py
diff --git
a/plugins/rawdisk.py
b/plugins/rawdisk.py
index
8124f67
..
b6f4708
100644
(file)
--- a/
plugins/rawdisk.py
+++ b/
plugins/rawdisk.py
@@
-1,5
+1,9
@@
#!/usr/bin/python -tt
# vim:set ts=4 sw=4 expandtab:
#!/usr/bin/python -tt
# vim:set ts=4 sw=4 expandtab:
+#
+# $Id$
+# $URL$
+#
# NodeManager plugin to support mapping unused raw disks into a slice
# that has the rawdisk sliver tag
# NodeManager plugin to support mapping unused raw disks into a slice
# that has the rawdisk sliver tag
@@
-17,8
+21,8
@@
import re
import logger
import tools
import logger
import tools
-def start(
options, config
):
- logger.log("rawdisk plugin starting up...")
+def start():
+ logger.log("rawdisk
:
plugin starting up...")
def get_unused_devices():
devices = []
def get_unused_devices():
devices = []
@@
-39,7
+43,6
@@
def get_unused_devices():
break
buf = buf.strip()
fields = re.split(pat, buf)
break
buf = buf.strip()
fields = re.split(pat, buf)
- print fields
dev = fields[-1]
if not dev.startswith("dm-") and dev.endswith("1") and dev not in in_vg:
devices.append("/dev/%s" % dev)
dev = fields[-1]
if not dev.startswith("dm-") and dev.endswith("1") and dev not in in_vg:
devices.append("/dev/%s" % dev)
@@
-47,14
+50,14
@@
def get_unused_devices():
return devices
def GetSlivers(data, config=None, plc=None):
return devices
def GetSlivers(data, config=None, plc=None):
- if 'slivers' not in data:
- logger.log
("sliverauth: getslivers data lack's sliver information. IGNORING!"
)
+ if 'slivers' not in data:
+ logger.log
_missing_data("rawdisk.GetSlivers",'slivers'
)
return
devices = get_unused_devices()
for sliver in data['slivers']:
for attribute in sliver['attributes']:
return
devices = get_unused_devices()
for sliver in data['slivers']:
for attribute in sliver['attributes']:
- name = attribute.get('tagname',attribute.get('name',''))
+
name = attribute.get('tagname',attribute.get('name',''))
if name == 'rawdisk':
for i in devices:
st = os.stat(i)
if name == 'rawdisk':
for i in devices:
st = os.stat(i)
@@
-62,8
+65,8
@@
def GetSlivers(data, config=None, plc=None):
if os.path.exists(path):
# should check whether its the proper type of device
continue
if os.path.exists(path):
# should check whether its the proper type of device
continue
-
- logger.log("Copying %s to %s" % (i, path))
+
+ logger.log("
rawdisk:
Copying %s to %s" % (i, path))
try:
if os.path.exists(path):
os.unlink(path)
try:
if os.path.exists(path):
os.unlink(path)