summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-06 15:19:00 +0000
committerGerrit Code Review <review@openstack.org>2019-03-06 15:19:00 +0000
commit8f068ac7056e00371dff99f5cb44767c688bccde (patch)
treeeff6ce74207f579e91f2ade3687c76fa01a97939
parent5e557192803616a96535d0ae18fba2d84bee2acd (diff)
parent52aac83b44153c20b50b589c462628817c9d1440 (diff)
Merge "Add the CentOS system to Ceph related configuration file."
-rwxr-xr-xtools/deployment/developer/ceph/040-ceph.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/deployment/developer/ceph/040-ceph.sh b/tools/deployment/developer/ceph/040-ceph.sh
index e24d1da..4003bb3 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)"
30#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this 30#NOTE(portdirect): to use RBD devices with Ubuntu kernels < 4.5 this
31# should be set to 'hammer' 31# should be set to 'hammer'
32. /etc/os-release 32. /etc/os-release
33if [ "x${ID}" == "xubuntu" ] && \ 33if [ "x${ID}" == "xcentos" ] || \
34 [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]; then 34 ([ "x${ID}" == "xubuntu" ] && \
35 [ "$(uname -r | awk -F "." '{ print $2 }')" -lt "5" ]); then
35 CRUSH_TUNABLES=hammer 36 CRUSH_TUNABLES=hammer
36else 37else
37 CRUSH_TUNABLES=null 38 CRUSH_TUNABLES=null