Revision 02691904
| b/lib/bootstrap.py | ||
|---|---|---|
| 109 | 109 |
master_netdev, file_storage_dir, |
| 110 | 110 |
secondary_ip=None, |
| 111 | 111 |
vg_name=None, beparams=None, hvparams=None, |
| 112 |
enabled_hypervisors=None): |
|
| 112 |
enabled_hypervisors=None, default_hypervisor=None):
|
|
| 113 | 113 |
"""Initialise the cluster. |
| 114 | 114 |
|
| 115 | 115 |
""" |
| ... | ... | |
| 215 | 215 |
cluster_name=clustername.name, |
| 216 | 216 |
file_storage_dir=file_storage_dir, |
| 217 | 217 |
enabled_hypervisors=enabled_hypervisors, |
| 218 |
default_hypervisor=default_hypervisor, |
|
| 218 | 219 |
beparams={constants.BEGR_DEFAULT: beparams},
|
| 219 | 220 |
hvparams=hvparams, |
| 220 | 221 |
) |
| b/lib/cmdlib.py | ||
|---|---|---|
| 1915 | 1915 |
"architecture": (platform.architecture()[0], platform.machine()), |
| 1916 | 1916 |
"name": cluster.cluster_name, |
| 1917 | 1917 |
"master": cluster.master_node, |
| 1918 |
"hypervisor_type": cluster.hypervisor,
|
|
| 1918 |
"default_hypervisor": cluster.default_hypervisor,
|
|
| 1919 | 1919 |
"enabled_hypervisors": cluster.enabled_hypervisors, |
| 1920 | 1920 |
"hvparams": cluster.hvparams, |
| 1921 | 1921 |
"beparams": cluster.beparams, |
| b/lib/objects.py | ||
|---|---|---|
| 688 | 688 |
"mac_prefix", |
| 689 | 689 |
"volume_group_name", |
| 690 | 690 |
"default_bridge", |
| 691 |
"hypervisor", |
|
| 691 |
"default_hypervisor",
|
|
| 692 | 692 |
"master_node", |
| 693 | 693 |
"master_ip", |
| 694 | 694 |
"master_netdev", |
| 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" |
| b/test/ganeti.config_unittest.py | ||
|---|---|---|
| 68 | 68 |
volume_group_name="xenvg", |
| 69 | 69 |
default_bridge=constants.DEFAULT_BRIDGE, |
| 70 | 70 |
tcpudp_port_pool=set(), |
| 71 |
hypervisor=constants.HT_FAKE, |
|
| 71 |
default_hypervisor=constants.HT_FAKE,
|
|
| 72 | 72 |
master_node=me.name, |
| 73 | 73 |
master_ip="127.0.0.1", |
| 74 | 74 |
master_netdev=constants.DEFAULT_BRIDGE, |
Also available in: Unified diff