git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f10f67
)
no functional change, just comments + cosmetic code change to be more similar to...
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 2 Jul 2014 07:56:50 +0000
(09:56 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 2 Jul 2014 07:56:50 +0000
(09:56 +0200)
sliver_vs.py
patch
|
blob
|
history
diff --git
a/sliver_vs.py
b/sliver_vs.py
index
432704c
..
8a76218
100644
(file)
--- a/
sliver_vs.py
+++ b/
sliver_vs.py
@@
-84,11
+84,10
@@
class Sliver_VS(vserver.VServer, Account, Initscript):
logger.verbose('sliver_vs: %s: create'%name)
vref = rec['vref']
if vref is None:
logger.verbose('sliver_vs: %s: create'%name)
vref = rec['vref']
if vref is None:
- logger.log("sliver_vs: %s: ERROR - no vref attached, this is unexpected"%(name))
# added by caglar
# band-aid for short period as old API doesn't have GetSliceFamily function
# added by caglar
# band-aid for short period as old API doesn't have GetSliceFamily function
- #return
vref = "planetlab-f8-i386"
vref = "planetlab-f8-i386"
+ logger.log("sliver_vs: %s: ERROR - no vref attached, using hard-wired default %s"%(name,vref))
# used to look in /etc/planetlab/family,
# now relies on the 'GetSliceFamily' extra attribute in GetSlivers()
# used to look in /etc/planetlab/family,
# now relies on the 'GetSliceFamily' extra attribute in GetSlivers()
@@
-99,7
+98,7
@@
class Sliver_VS(vserver.VServer, Account, Initscript):
logger.log ("sliver_vs: %s: ERROR Could not create sliver - vreference image %s not found"%(name,vref))
return
logger.log ("sliver_vs: %s: ERROR Could not create sliver - vreference image %s not found"%(name,vref))
return
- #
guess arch
+ #
compute guest personality
try:
(x,y,arch)=vref.split('-')
# mh, this of course applies when 'vref' is e.g. 'netflow'
try:
(x,y,arch)=vref.split('-')
# mh, this of course applies when 'vref' is e.g. 'netflow'
@@
-107,11
+106,7
@@
class Sliver_VS(vserver.VServer, Account, Initscript):
except:
arch='i386'
except:
arch='i386'
- def personality (arch):
- personality="linux32"
- if arch.find("64")>=0:
- personality="linux64"
- return personality
+ def personality (arch): return "linux64" if arch.find("64") >=0 else "linux32"
command=[]
# be verbose
command=[]
# be verbose