Revision b119bccb
b/lib/bootstrap.py | ||
---|---|---|
137 | 137 |
if config.ConfigWriter.IsCluster(): |
138 | 138 |
raise errors.OpPrereqError("Cluster is already initialised") |
139 | 139 |
|
140 |
if not enabled_hypervisors: |
|
141 |
raise errors.OpPrereqError("Enabled hypervisors list must contain at" |
|
142 |
" least one member") |
|
143 |
invalid_hvs = set(enabled_hypervisors) - constants.HYPER_TYPES |
|
144 |
if invalid_hvs: |
|
145 |
raise errors.OpPrereqError("Enabled hypervisors contains invalid" |
|
146 |
" entries: %s" % invalid_hvs) |
|
147 |
|
|
140 | 148 |
hostname = utils.HostInfo() |
141 | 149 |
|
142 | 150 |
if hostname.ip.startswith("127."): |
b/lib/cmdlib.py | ||
---|---|---|
1516 | 1516 |
|
1517 | 1517 |
if self.op.enabled_hypervisors is not None: |
1518 | 1518 |
self.hv_list = self.op.enabled_hypervisors |
1519 |
if not self.hv_list: |
|
1520 |
raise errors.OpPrereqError("Enabled hypervisors list must contain at" |
|
1521 |
" least one member") |
|
1522 |
invalid_hvs = set(self.hv_list) - constants.HYPER_TYPES |
|
1523 |
if invalid_hvs: |
|
1524 |
raise errors.OpPrereqError("Enabled hypervisors contains invalid" |
|
1525 |
" entries: %s" % invalid_hvs) |
|
1519 | 1526 |
else: |
1520 | 1527 |
self.hv_list = cluster.enabled_hypervisors |
1521 | 1528 |
|
b/scripts/gnt-cluster | ||
---|---|---|
93 | 93 |
hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter] |
94 | 94 |
utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES) |
95 | 95 |
|
96 |
for hv in hvlist: |
|
97 |
if hv not in constants.HYPER_TYPES: |
|
98 |
ToStderr("invalid hypervisor: %s", hv) |
|
99 |
return 1 |
|
100 |
|
|
101 | 96 |
bootstrap.InitCluster(cluster_name=args[0], |
102 | 97 |
secondary_ip=opts.secondary_ip, |
103 | 98 |
vg_name=vg_name, |
Also available in: Unified diff