Revision 02691904 scripts/gnt-cluster
| b/scripts/gnt-cluster | ||
|---|---|---|
| 56 | 56 |
if hvlist is not None: |
| 57 | 57 |
hvlist = hvlist.split(",")
|
| 58 | 58 |
else: |
| 59 |
hvlist = constants.DEFAULT_ENABLED_HYPERVISOR |
|
| 59 |
hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR] |
|
| 60 |
|
|
| 61 |
# avoid an impossible situation |
|
| 62 |
if opts.default_hypervisor in hvlist: |
|
| 63 |
default_hypervisor = opts.default_hypervisor |
|
| 64 |
else: |
|
| 65 |
default_hypervisor = hvlist[0] |
|
| 60 | 66 |
|
| 61 | 67 |
hvparams = opts.hvparams |
| 62 | 68 |
if hvparams: |
| ... | ... | |
| 108 | 114 |
master_netdev=opts.master_netdev, |
| 109 | 115 |
file_storage_dir=opts.file_storage_dir, |
| 110 | 116 |
enabled_hypervisors=hvlist, |
| 117 |
default_hypervisor=default_hypervisor, |
|
| 111 | 118 |
hvparams=hvparams, |
| 112 | 119 |
beparams=beparams) |
| 113 | 120 |
return 0 |
| ... | ... | |
| 197 | 204 |
ToStdout("Architecture (this node): %s (%s)",
|
| 198 | 205 |
result["architecture"][0], result["architecture"][1]) |
| 199 | 206 |
|
| 200 |
ToStdout("Default hypervisor: %s", result["hypervisor_type"])
|
|
| 207 |
ToStdout("Default hypervisor: %s", result["default_hypervisor"])
|
|
| 201 | 208 |
ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"]))
|
| 202 | 209 |
|
| 203 | 210 |
ToStdout("Hypervisor parameters:")
|
| ... | ... | |
| 490 | 497 |
make_option("--enabled-hypervisors", dest="enabled_hypervisors",
|
| 491 | 498 |
help="Comma-separated list of hypervisors", |
| 492 | 499 |
type="string", default=None), |
| 500 |
make_option("-t", "--default-hypervisor",
|
|
| 501 |
dest="default_hypervisor", |
|
| 502 |
help="Default hypervisor to use for instance creation", |
|
| 503 |
choices=list(constants.HYPER_TYPES), |
|
| 504 |
default=constants.DEFAULT_ENABLED_HYPERVISOR), |
|
| 493 | 505 |
ikv_option("-H", "--hypervisor-parameters", dest="hvparams",
|
| 494 | 506 |
help="Hypervisor and hypervisor options, in the" |
| 495 | 507 |
" format" |
Also available in: Unified diff