From 912ddafe94d53393bbcacfd39c1a5a558e23b83f Mon Sep 17 00:00:00 2001 From: yidong0635 Date: Thu, 10 Oct 2019 12:01:45 -0400 Subject: [PATCH] test/ceph : Update script to fix some issues. 1. Remove created dir name with "/". 2. Compatible with upper version of ceph-authtool without --set-uid, let it run as default. 3. Fix error on ceph 12.*.* This is to fix issue #980 which blocks by ceph-authtool. If there's still other issue, should append fix. Change-Id: Icd7fb4177a75a731ae3d4d5fc51cef16eeab282f Signed-off-by: yidong0635 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/470915 Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto Reviewed-by: Maciej Wawryk Reviewed-by: Karol Latecki Tested-by: SPDK CI Jenkins --- scripts/ceph/start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ceph/start.sh b/scripts/ceph/start.sh index 8727ab57c..41a6a243d 100755 --- a/scripts/ceph/start.sh +++ b/scripts/ceph/start.sh @@ -8,7 +8,7 @@ script_dir=$(readlink -f $(dirname $0)) base_dir=/var/tmp/ceph mon_ip=$1 -mon_dir=${base_dir}/mon.a/ +mon_dir=${base_dir}/mon.a pid_dir=${base_dir}/pid ceph_conf=${base_dir}/ceph.conf mnt_dir=${base_dir}/mnt @@ -51,7 +51,7 @@ kpartx ${dev} # prep osds -mnt_pt=${mnt_dir}/osd-device-0-data/ +mnt_pt=${mnt_dir}/osd-device-0-data mkdir -p ${mnt_pt} mkfs.xfs -f /dev/disk/by-partlabel/osd-device-0-data mount /dev/disk/by-partlabel/osd-device-0-data ${mnt_pt} @@ -68,7 +68,7 @@ mkdir -p ${mon_dir} mkdir -p ${pid_dir} ceph-authtool --create-keyring --gen-key --name=mon. ${base_dir}/keyring --cap mon 'allow *' -ceph-authtool --gen-key --name=client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *' ${base_dir}/keyring +ceph-authtool --gen-key --name=client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *' ${base_dir}/keyring monmaptool --create --clobber --add a ${mon_ip}:12046 --print ${base_dir}/monmap