From 7b6c844d92dd083b496617918e8da78f226a0400 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Tue, 22 Sep 2020 13:38:45 +0000 Subject: [PATCH] [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 (cherry picked from commit 68e6c0e48ddeab37af43b9ef553ddefaf1e54d8c) (cherry picked from commit 31b0aec56b3dfc220e1a8e9d1864eddcc3f3b4e7) --- .../common/templates/fragments/configure-docker-storage.sh | 2 +- .../common/templates/kubernetes/fragments/configure-etcd.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/magnum/drivers/common/templates/fragments/configure-docker-storage.sh b/magnum/drivers/common/templates/fragments/configure-docker-storage.sh index b3a4df41c0..2254645507 100644 --- a/magnum/drivers/common/templates/fragments/configure-docker-storage.sh +++ b/magnum/drivers/common/templates/fragments/configure-docker-storage.sh @@ -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 diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh index 7cc95bfdf4..30752fae35 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-etcd.sh @@ -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