From 3f802c1a0d5bc8f87bfa17c90b2a3a3ccf4a9edd Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 22 Apr 2021 15:56:05 +0200 Subject: [PATCH] Fix Fedora CoreOS 31 Cinder volume on virtio-scsi disk When using a >= Victoria release with Fedora CoreOS 31 using Cinder and overlay2 with the instance being spawned on disk using virtio-scsi the name of the disk in by-id is different. [root@test-x7kpb2b2lm5j-master-0 ~]# ls /dev/disk/by-id | grep 'c7ba029d-1c6a-4392-9' scsi-0QEMU_QEMU_HARDDISK_c7ba029d-1c6a-4392-992d-dbff27214740 [root@test-x7kpb2b2lm5j-master-0 ~]# ls /dev/disk/by-id | grep 'c7ba029d-1c6a-4392-9$' [root@test-x7kpb2b2lm5j-master-0 ~]# cat /etc/fedora-release Fedora release 31 (Thirty One) Change-Id: I5a05cdebe59178d4e9362ce6e6f026d397c93725 --- .../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..86be3eb2d8 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}) 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..59feb3ca3f 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}) if [ -n "${device_name}" ]; then break fi