[fix] Detect virtio-scsi volumes correctly
When the Cinder volume is presented as a virtio-scsi volume, the device_name detection fails. This change allows the device name to be retrieved correctly for both virtio-pci and virtio-scsi cases. Story: 2008618 Task: 41808 Change-Id: Ia6a848eae11bc38ff71ef4575247010a8ffaa47b
This commit is contained in:
parent
12766eaff8
commit
68e6c0e48d
@ -13,7 +13,7 @@ if [ -n "$DOCKER_VOLUME_SIZE" ] && [ "$DOCKER_VOLUME_SIZE" -gt 0 ]; then
|
||||
else
|
||||
attempts=60
|
||||
while [ ${attempts} -gt 0 ]; do
|
||||
device_name=$($ssh_cmd ls /dev/disk/by-id | grep ${DOCKER_VOLUME:0:20}$)
|
||||
device_name=$($ssh_cmd ls /dev/disk/by-id | grep ${DOCKER_VOLUME:0:20} | head -n1)
|
||||
if [ -n "${device_name}" ]; then
|
||||
break
|
||||
fi
|
||||
|
@ -20,7 +20,7 @@ if [ -n "$ETCD_VOLUME_SIZE" ] && [ "$ETCD_VOLUME_SIZE" -gt 0 ]; then
|
||||
|
||||
attempts=60
|
||||
while [ ${attempts} -gt 0 ]; do
|
||||
device_name=$($ssh_cmd ls /dev/disk/by-id | grep ${ETCD_VOLUME:0:20}$)
|
||||
device_name=$($ssh_cmd ls /dev/disk/by-id | grep ${ETCD_VOLUME:0:20} | head -n1)
|
||||
if [ -n "${device_name}" ]; then
|
||||
break
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user