projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix gnt-cluster init without cluster parameters
[ganeti-local]
/
scripts
/
gnt-cluster
diff --git
a/scripts/gnt-cluster
b/scripts/gnt-cluster
index
f2d4bd4
..
9ebd10f
100755
(executable)
--- a/
scripts/gnt-cluster
+++ b/
scripts/gnt-cluster
@@
-94,7
+94,9
@@
def InitCluster(opts, args):
ToStderr("%s must be an integer", constants.BE_VCPUS)
return 1
ToStderr("%s must be an integer", constants.BE_VCPUS)
return 1
- beparams[constants.BE_MEMORY] = utils.ParseUnit(beparams[constants.BE_MEMORY])
+ if not isinstance(beparams[constants.BE_MEMORY], int):
+ beparams[constants.BE_MEMORY] = utils.ParseUnit(
+ beparams[constants.BE_MEMORY])
# prepare hvparams dict
for hv in constants.HYPER_TYPES:
# prepare hvparams dict
for hv in constants.HYPER_TYPES: