Revision 112050d9
| b/lib/cmdlib.py | ||
|---|---|---|
| 3171 | 3171 |
for s in ("data", "meta")
|
| 3172 | 3172 |
]) |
| 3173 | 3173 |
for idx, disk in enumerate(disk_info): |
| 3174 |
disk_index = idx + base_index |
|
| 3174 | 3175 |
disk_dev = _GenerateDRBD8Branch(lu, primary_node, remote_node, |
| 3175 | 3176 |
disk["size"], names[idx*2:idx*2+2], |
| 3176 | 3177 |
"disk/%d" % disk_index, |
| ... | ... | |
| 3181 | 3182 |
raise errors.ProgrammerError("Wrong template configuration")
|
| 3182 | 3183 |
|
| 3183 | 3184 |
for idx, disk in enumerate(disk_info): |
| 3184 |
|
|
| 3185 |
disk_index = idx + base_index |
|
| 3185 | 3186 |
disk_dev = objects.Disk(dev_type=constants.LD_FILE, size=disk["size"], |
| 3186 | 3187 |
iv_name="disk/%d" % disk_index, |
| 3187 | 3188 |
logical_id=(file_driver, |
| b/scripts/gnt-instance | ||
|---|---|---|
| 306 | 306 |
# default of one nic, all auto |
| 307 | 307 |
nics = [{}]
|
| 308 | 308 |
|
| 309 |
if not opts.disks and opts.disk_template != constants.DT_DISKLESS: |
|
| 310 |
raise errors.OpPrereqError("No disk information specified")
|
|
| 311 |
elif opts.disks and opts.disk_template == constants.DT_DISKLESS: |
|
| 312 |
raise errors.OpPrereqError("Diskless instance but disk information passeD")
|
|
| 309 |
if opts.disk_template == constants.DT_DISKLESS: |
|
| 310 |
if opts.disks: |
|
| 311 |
raise errors.OpPrereqError("Diskless instance but disk"
|
|
| 312 |
" information passed") |
|
| 313 |
disks = [] |
|
| 313 | 314 |
else: |
| 315 |
if not opts.disks: |
|
| 316 |
raise errors.OpPrereqError("No disk information specified")
|
|
| 314 | 317 |
try: |
| 315 | 318 |
disk_max = max(int(didx[0])+1 for didx in opts.disks) |
| 316 | 319 |
except ValueError, err: |
Also available in: Unified diff