From patchwork Thu Aug 16 10:56:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Danny Kukawka X-Patchwork-Id: 1330761 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A0EF33FC33 for ; Thu, 16 Aug 2012 10:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754987Ab2HPK5D (ORCPT ); Thu, 16 Aug 2012 06:57:03 -0400 Received: from wp188.webpack.hosteurope.de ([80.237.132.195]:51517 "EHLO wp188.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755254Ab2HPK5C (ORCPT ); Thu, 16 Aug 2012 06:57:02 -0400 Received: from nat.nue.novell.com ([195.135.221.2] helo=darkangel.suse.de); authenticated by wp188.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) id 1T1xl5-0001Xu-8V; Thu, 16 Aug 2012 12:56:59 +0200 From: Danny Kukawka To: ceph-devel@vger.kernel.org Cc: Danny Kukawka Subject: =?UTF-8?q?=5BPATCH=5D=20fix=20keyring=20generation=20for=20mds=20and=20osd?= Date: Thu, 16 Aug 2012 12:56:58 +0200 Message-Id: <1345114618-3464-1-git-send-email-danny.kukawka@bisect.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de; danny.kukawka@bisect.de; 1345114622; 11f28eea; Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Fix config keys for OSD/MDS data dirs. As in documentation and other places of the scripts the keys are 'osd data'/'mds data' and not 'osd_data' In case if MDS: if 'mds data' doesn't exist, create it. Signed-off-by: Danny Kukawka --- src/mkcephfs.in | 5 +++-- 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 402c870..7ab6664 100644 --- a/src/mkcephfs.in +++ b/src/mkcephfs.in @@ -251,14 +251,15 @@ if [ -n "$initdaemon" ]; then if [ $type = "osd" ]; then $BINDIR/ceph-osd -c $conf --monmap $dir/monmap -i $id --mkfs --mkkey - get_conf osd_data "/var/lib/ceph/osd/ceph-$id" "osd_data" + get_conf osd_data "/var/lib/ceph/osd/ceph-$id" "osd data" get_conf osd_keyring "$osd_data/keyring" "keyring" $BINDIR/ceph-authtool -p -n $name $osd_keyring > $dir/key.$name fi if [ $type = "mds" ]; then - get_conf mds_data "/var/lib/ceph/mds/ceph-$id" "mds_data" + get_conf mds_data "/var/lib/ceph/mds/ceph-$id" "mds data" get_conf mds_keyring "$mds_data/keyring" "keyring" + test -d $mds_data || mkdir -p $mds_data echo "creating private key for $name keyring $mds_keyring" $BINDIR/ceph-authtool --create-keyring --gen-key -n $name $mds_keyring $BINDIR/ceph-authtool -p -n $name $mds_keyring > $dir/key.$name