From 52aac83b44153c20b50b589c462628817c9d1440 Mon Sep 17 00:00:00 2001 From: leledashenqi Date: Wed, 19 Dec 2018 15:15:57 +0800 Subject: [PATCH] Add the CentOS system to Ceph related configuration file. To use RBD devices with CentOS system, multinode deployment script has already been modifed. Change-Id: I8a1ac13b0ec124b14b2bdd06ea3b0a9c081d468c Story:2004640 Task:28577 --- tools/deployment/developer/ceph/040-ceph.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh index e24d1dacfe..4003bb3e59 100755 --- a/tools/deployment/developer/ceph/040-ceph.sh +++ b/tools/deployment/developer/ceph/040-ceph.sh @@ -30,8 +30,9 @@ CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" #NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this # should be set to 'hammer' . /etc/os-release -if [ "x${ID}" == "xubuntu" ] && \ - [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then +if [ "x${ID}" == "xcentos" ] || \ + ([ "x${ID}" == "xubuntu" ] && \ + [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]); then CRUSH_TUNABLES=hammer else CRUSH_TUNABLES=null