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
Add support for assigning IP addresses
[nodemanager.git]
/
sm.py
diff --git
a/sm.py
b/sm.py
index
12e906c
..
3acce63
100644
(file)
--- a/
sm.py
+++ b/
sm.py
@@
-7,7
+7,7
@@
also to make inter-sliver resource loans. The sliver manager is also
responsible for handling delegation accounts.
"""
responsible for handling delegation accounts.
"""
-# $Id: sm.py,v 1.2
6 2007/07/23 19:28:07 faiyaza
Exp $
+# $Id: sm.py,v 1.2
7 2007/07/24 15:59:04 dhozac
Exp $
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@
-41,6
+41,8
@@
DEFAULT_ALLOCATION = {
'disk_max': 5000000, # bytes
# capabilities
'capabilities': '',
'disk_max': 5000000, # bytes
# capabilities
'capabilities': '',
+ # IP-addresses'
+ 'ip_addresses': '',
# NOTE: this table is further populated with resource names and
# default amounts via the start() function below. This probably
# NOTE: this table is further populated with resource names and
# default amounts via the start() function below. This probably