Revision 5706396c
b/lib/cmdlib/instance_utils.py | ||
---|---|---|
570 | 570 |
vg, name = disk.logical_id |
571 | 571 |
ret = { |
572 | 572 |
"INSTANCE_DISK%d_VG" % idx : vg, |
573 |
"INSTANCE_DISK%d_NAME" % idx : name
|
|
573 |
"INSTANCE_DISK%d_ID" % idx : name
|
|
574 | 574 |
} |
575 | 575 |
elif template_name in (constants.DT_FILE, constants.DT_SHARED_FILE): |
576 | 576 |
file_driver, name = disk.logical_id |
577 | 577 |
ret = { |
578 | 578 |
"INSTANCE_DISK%d_DRIVER" % idx : file_driver, |
579 |
"INSTANCE_DISK%d_NAME" % idx : name
|
|
579 |
"INSTANCE_DISK%d_ID" % idx : name
|
|
580 | 580 |
} |
581 | 581 |
|
582 | 582 |
elif template_name == constants.DT_BLOCK: |
583 | 583 |
block_driver, adopt = disk.logical_id |
584 | 584 |
ret = { |
585 | 585 |
"INSTANCE_DISK%d_DRIVER" % idx : block_driver, |
586 |
"INSTANCE_DISK%d_NAME" % idx : name
|
|
586 |
"INSTANCE_DISK%d_ID" % idx : name
|
|
587 | 587 |
} |
588 | 588 |
|
589 | 589 |
elif template_name == constants.DT_RBD: |
590 | 590 |
rbd, name = disk.logical_id |
591 | 591 |
ret = { |
592 | 592 |
"INSTANCE_DISK%d_DRIVER" % idx : rbd, |
593 |
"INSTANCE_DISK%d_NAME" % idx : name
|
|
593 |
"INSTANCE_DISK%d_ID" % idx : name
|
|
594 | 594 |
} |
595 | 595 |
|
596 | 596 |
elif template_name == constants.DT_EXT: |
597 | 597 |
provider, name = disk.logical_id |
598 | 598 |
ret = { |
599 | 599 |
"INSTANCE_DISK%d_PROVIDER" % idx : provider, |
600 |
"INSTANCE_DISK%d_NAME" % idx : name
|
|
600 |
"INSTANCE_DISK%d_ID" % idx : name
|
|
601 | 601 |
} |
602 | 602 |
|
603 | 603 |
elif template_name == constants.DT_DRBD8: |
... | ... | |
612 | 612 |
"INSTANCE_DISK%d_PMINOR" % idx : pmin, |
613 | 613 |
"INSTANCE_DISK%d_SMINOR" % idx : smin, |
614 | 614 |
"INSTANCE_DISK%d_DATA_VG" % idx : data_vg, |
615 |
"INSTANCE_DISK%d_DATA_NAME" % idx : data_name,
|
|
615 |
"INSTANCE_DISK%d_DATA_ID" % idx : data_name,
|
|
616 | 616 |
"INSTANCE_DISK%d_META_VG" % idx : meta_vg, |
617 |
"INSTANCE_DISK%d_META_NAME" % idx : meta_name,
|
|
617 |
"INSTANCE_DISK%d_META_ID" % idx : meta_name,
|
|
618 | 618 |
} |
619 | 619 |
|
620 | 620 |
elif template_name == constants.DT_DISKLESS: |
Also available in: Unified diff