Revision 8f348e36
b/scripts/gnt-cluster | ||
---|---|---|
60 | 60 |
if hvlist is not None: |
61 | 61 |
hvlist = hvlist.split(",") |
62 | 62 |
else: |
63 |
hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR]
|
|
63 |
hvlist = [opts.default_hypervisor]
|
|
64 | 64 |
|
65 | 65 |
# avoid an impossible situation |
66 |
if opts.default_hypervisor in hvlist: |
|
67 |
default_hypervisor = opts.default_hypervisor |
|
68 |
else: |
|
69 |
default_hypervisor = hvlist[0] |
|
66 |
if opts.default_hypervisor not in hvlist: |
|
67 |
ToStderr("The default hypervisor requested (%s) is not" |
|
68 |
" within the enabled hypervisor list (%s)" % |
|
69 |
(opts.default_hypervisor, hvlist)) |
|
70 |
return 1 |
|
70 | 71 |
|
71 | 72 |
hvparams = opts.hvparams |
72 | 73 |
if hvparams: |
... | ... | |
120 | 121 |
master_netdev=opts.master_netdev, |
121 | 122 |
file_storage_dir=opts.file_storage_dir, |
122 | 123 |
enabled_hypervisors=hvlist, |
123 |
default_hypervisor=default_hypervisor, |
|
124 |
default_hypervisor=opts.default_hypervisor,
|
|
124 | 125 |
hvparams=hvparams, |
125 | 126 |
beparams=beparams) |
126 | 127 |
return 0 |
Also available in: Unified diff