summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-21 21:09:36 +0000
committerGerrit Code Review <review@openstack.org>2016-12-21 21:09:36 +0000
commit33bdba26d668d91f213515a91f8797b9b249d84a (patch)
tree531bfcb54274746c76f83a18be531688735e9e7e
parent4a7e093a6b31a8bee1afb93e45d7d59114245bcc (diff)
parent623c24978294d86513180cf0419536eb30547a2f (diff)
Merge "Use df instead of findmnt in cephstorage upgrade scripts"
-rw-r--r--extraconfig/tasks/major_upgrade_ceph_storage.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraconfig/tasks/major_upgrade_ceph_storage.sh b/extraconfig/tasks/major_upgrade_ceph_storage.sh
index 59b7c20e..a745e723 100644
--- a/extraconfig/tasks/major_upgrade_ceph_storage.sh
+++ b/extraconfig/tasks/major_upgrade_ceph_storage.sh
@@ -76,7 +76,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