projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnt-cluster init, handle candidate_pool_size
[ganeti-local]
/
scripts
/
gnt-cluster
diff --git
a/scripts/gnt-cluster
b/scripts/gnt-cluster
index
f2d4bd4
..
1c9134b
100755
(executable)
--- a/
scripts/gnt-cluster
+++ b/
scripts/gnt-cluster
@@
-36,6
+36,7
@@
from ganeti import bootstrap
from ganeti import ssh
from ganeti import ssh
+@UsesRPC
def InitCluster(opts, args):
"""Initialize the cluster.
def InitCluster(opts, args):
"""Initialize the cluster.
@@
-59,13
+60,14
@@
def InitCluster(opts, args):
if hvlist is not None:
hvlist = hvlist.split(",")
else:
if hvlist is not None:
hvlist = hvlist.split(",")
else:
- hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR]
+ hvlist = [opts.default_hypervisor]
# avoid an impossible situation
# avoid an impossible situation
- if opts.default_hypervisor in hvlist:
- default_hypervisor = opts.default_hypervisor
- else:
- default_hypervisor = hvlist[0]
+ if opts.default_hypervisor not in hvlist:
+ ToStderr("The default hypervisor requested (%s) is not"
+ " within the enabled hypervisor list (%s)" %
+ (opts.default_hypervisor, hvlist))
+ return 1
hvparams = opts.hvparams
if hvparams:
hvparams = opts.hvparams
if hvparams:
@@
-94,7
+96,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:
@@
-117,12
+121,15
@@
def InitCluster(opts, args):
master_netdev=opts.master_netdev,
file_storage_dir=opts.file_storage_dir,
enabled_hypervisors=hvlist,
master_netdev=opts.master_netdev,
file_storage_dir=opts.file_storage_dir,
enabled_hypervisors=hvlist,
- default_hypervisor=default_hypervisor,
+ default_hypervisor=opts.default_hypervisor,
hvparams=hvparams,
hvparams=hvparams,
- beparams=beparams)
+ beparams=beparams,
+ candidate_pool_size=opts.candidate_pool_size,
+ )
return 0
return 0
+@UsesRPC
def DestroyCluster(opts, args):
"""Destroy the cluster.
def DestroyCluster(opts, args):
"""Destroy the cluster.
@@
-234,6
+241,9
@@
def ShowClusterConfig(opts, args):
ToStdout(" %s: %s", item, val)
ToStdout("Cluster parameters:")
ToStdout(" %s: %s", item, val)
ToStdout("Cluster parameters:")
+ ToStdout(" - candidate pool size: %s", result["candidate_pool_size"])
+
+ ToStdout("Default instance parameters:")
for gr_name, gr_dict in result["beparams"].items():
ToStdout(" - %s:", gr_name)
for item, val in gr_dict.iteritems():
for gr_name, gr_dict in result["beparams"].items():
ToStdout(" - %s:", gr_name)
for item, val in gr_dict.iteritems():
@@
-394,6
+404,7
@@
def VerifyDisks(opts, args):
return retcode
return retcode
+@UsesRPC
def MasterFailover(opts, args):
"""Failover the master node.
def MasterFailover(opts, args):
"""Failover the master node.
@@
-443,7
+454,7
@@
def SetClusterParams(opts, args):
"""
if not (not opts.lvm_storage or opts.vg_name or
opts.enabled_hypervisors or opts.hvparams or
"""
if not (not opts.lvm_storage or opts.vg_name or
opts.enabled_hypervisors or opts.hvparams or
- opts.beparams):
+ opts.beparams or opts.candidate_pool_size is not None):
ToStderr("Please give at least one of the parameters.")
return 1
ToStderr("Please give at least one of the parameters.")
return 1
@@
-466,7
+477,8
@@
def SetClusterParams(opts, args):
op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
enabled_hypervisors=hvlist,
hvparams=hvparams,
op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
enabled_hypervisors=hvlist,
hvparams=hvparams,
- beparams=beparams)
+ beparams=beparams,
+ candidate_pool_size=opts.candidate_pool_size)
SubmitOpCode(op)
return 0
SubmitOpCode(op)
return 0
@@
-560,6
+572,10
@@
commands = {
keyval_option("-B", "--backend-parameters", dest="beparams",
type="keyval", default={},
help="Backend parameters"),
keyval_option("-B", "--backend-parameters", dest="beparams",
type="keyval", default={},
help="Backend parameters"),
+ make_option("-C", "--candidate-pool-size",
+ default=constants.MASTER_POOL_SIZE_DEFAULT,
+ help="Set the candidate pool size",
+ dest="candidate_pool_size", type="int"),
],
"[opts...] <cluster_name>",
"Initialises a new cluster configuration"),
],
"[opts...] <cluster_name>",
"Initialises a new cluster configuration"),
@@
-631,6
+647,9
@@
commands = {
keyval_option("-B", "--backend-parameters", dest="beparams",
type="keyval", default={},
help="Backend parameters"),
keyval_option("-B", "--backend-parameters", dest="beparams",
type="keyval", default={},
help="Backend parameters"),
+ make_option("-C", "--candidate-pool-size", default=None,
+ help="Set the candidate pool size",
+ dest="candidate_pool_size", type="int"),
],
"[opts...]",
"Alters the parameters of the cluster"),
],
"[opts...]",
"Alters the parameters of the cluster"),