Revision 2f505cb5 tools/burnin
b/tools/burnin | ||
---|---|---|
131 | 131 |
help="Skip instance stop/start", action="store_false", |
132 | 132 |
default=True) |
133 | 133 |
parser.add_option("-t", "--disk-template", dest="disk_template", |
134 |
choices=("diskless", "plain", "drbd"), |
|
134 |
choices=("diskless", "file", "plain", "drbd"),
|
|
135 | 135 |
default="drbd", |
136 |
help="Disk template (diskless, plain or drbd) [drbd]") |
|
136 |
help="Disk template (diskless, file, plain or drbd)" |
|
137 |
" [drbd]") |
|
137 | 138 |
parser.add_option("-n", "--nodes", dest="nodes", default="", |
138 | 139 |
help="Comma separated list of nodes to perform" |
139 | 140 |
" the burnin on (defaults to all nodes)") |
... | ... | |
143 | 144 |
Usage() |
144 | 145 |
|
145 | 146 |
supported_disk_templates = (constants.DT_DISKLESS, |
147 |
constants.DT_FILE, |
|
146 | 148 |
constants.DT_PLAIN, |
147 | 149 |
constants.DT_DRBD8) |
148 | 150 |
if options.disk_template not in supported_disk_templates: |
... | ... | |
206 | 208 |
mac="auto", |
207 | 209 |
kernel_path=None, |
208 | 210 |
initrd_path=None, |
209 |
hvm_boot_order=None) |
|
211 |
hvm_boot_order=None, |
|
212 |
file_driver="loop", |
|
213 |
file_storage_dir=None) |
|
210 | 214 |
Log("- Add instance %s on nodes %s/%s" % (instance, pnode, snode)) |
211 | 215 |
self.ExecOp(op) |
212 | 216 |
self.to_rem.append(instance) |
... | ... | |
320 | 324 |
Log("- Testing global parameters") |
321 | 325 |
|
322 | 326 |
if (len(self.nodes) == 1 and |
323 |
opts.disk_template not in (constants.DT_DISKLESS, constants.DT_PLAIN)): |
|
327 |
opts.disk_template not in (constants.DT_DISKLESS, constants.DT_PLAIN, |
|
328 |
constants.DT_FILE)): |
|
324 | 329 |
Log("When one node is available/selected the disk template must" |
325 |
" be 'plain' or 'diskless'")
|
|
330 |
" be 'diskless', 'file' or 'plain'")
|
|
326 | 331 |
sys.exit(1) |
327 | 332 |
|
328 | 333 |
has_err = True |
Also available in: Unified diff