From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 12 Dec 2016 21:37:48 +0000 (+0100)
Subject: Use df instead of findmnt in cephstorage upgrade scripts
X-Git-Tag: opnfv-6.0.0~1304^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=623c24978294d86513180cf0419536eb30547a2f;p=apex-tripleo-heat-templates.git

Use df instead of findmnt in cephstorage upgrade scripts

There are scenarios in which findmnt will return a list of all
mounted filesystems, which causes the upgrade script to fail in
recognizing if the Ceph OSD is backed by ext4.

Change-Id: Iadebdc32b523c05216202b782ceb54bec4389413
Closes-Bug: #1649407
---

diff --git a/extraconfig/tasks/major_upgrade_ceph_storage.sh b/extraconfig/tasks/major_upgrade_ceph_storage.sh
index d84cad45..b58ce38a 100644
--- a/extraconfig/tasks/major_upgrade_ceph_storage.sh
+++ b/extraconfig/tasks/major_upgrade_ceph_storage.sh
@@ -86,7 +86,7 @@ elif [[ "$UPDATED_VERSION" =~ ^10\.2.* ]]; then
     # If on ext4, we need to enforce lower values for name and namespace len
     # or ceph-osd will refuse to start, see: http://tracker.ceph.com/issues/16187
     for OSD_ID in $OSD_IDS; do
-      OSD_FS=$(findmnt -n -o FSTYPE -T /var/lib/ceph/osd/ceph-${OSD_ID})
+      OSD_FS=$(df -l --output=fstype /var/lib/ceph/osd/ceph-${OSD_ID} | tail -n +2)
       if [ ${OSD_FS} = ext4 ]; then
         crudini --set /etc/ceph/ceph.conf global osd_max_object_name_len 256
         crudini --set /etc/ceph/ceph.conf global osd_max_object_namespace_len 64