From patchwork Mon Oct 22 15:13:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Buck X-Patchwork-Id: 1626361 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A0AADDF2F8 for ; Mon, 22 Oct 2012 15:19:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754611Ab2JVPTb (ORCPT ); Mon, 22 Oct 2012 11:19:31 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:36400 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754155Ab2JVPT3 (ORCPT ); Mon, 22 Oct 2012 11:19:29 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so2003549pad.19 for ; Mon, 22 Oct 2012 08:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=IsHgw38fAE73CfJN5gHy0ee3v9g/r5aENqinWW3MYgU=; b=KoyYdXzNdLAu81IgbPlI/5RH774mFW0qSaUG6vuB7CW81MYQ4PXfz9RPa+nyHf5OpE GGYomWsN+UXdlVU0fjLPhJCUu3gG93eROWc9HNl9BLZxZCHiNorH4uVYVB6S/NF/9ssq oM5JycjyCDQb8cVspssnxOdzhsrM3O76udyaNQ/a/uIZ5IvY/UBg8xY2b+fEvU/eOGM1 W10yecwC5n7uvLrtcQ8tq35y1GkHY1jtZkO23D1RN/lsVX08CMP/Kl7K9TvM0yfRHeiM ota7Wy2oX0kynhRRyEPISkGaIbMNcvsFLinqwRrBVsisvnKuJfpsO2GkfVwGXDVx61UK O51w== Received: by 10.68.217.67 with SMTP id ow3mr31089540pbc.26.1350918818111; Mon, 22 Oct 2012 08:13:38 -0700 (PDT) Received: from [128.114.52.35] (bender.soe.ucsc.edu. [128.114.52.35]) by mx.google.com with ESMTPS id bv6sm6054132pab.13.2012.10.22.08.13.37 (version=SSLv3 cipher=OTHER); Mon, 22 Oct 2012 08:13:37 -0700 (PDT) Message-ID: <508562A1.2040106@gmail.com> Date: Mon, 22 Oct 2012 08:13:37 -0700 From: Joe Buck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: Re: Proposed change to vstart.sh References: <508469CE.3000502@gmail.com> In-Reply-To: Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Updated version of the diff with the -X flag used to turn cephX off, -x to turn it on (for historical consistency) and an updated help output that reflects this change. CephX is on by default. I figured I'd send this out independent of the issues around vstart working when cephX is off getting sorted out. -Joe Buck On 10/21/2012 02:35 PM, Sage Weil wrote: > On Sun, 21 Oct 2012, Joe Buck wrote: >> It looks like vstart.sh does not work without authx enabled. Given that, I'd >> propose to change the default to having cephx be enabled and then use the -x >> flag to disable cephx. >> >> Interestingly enough, the help output for vstart.sh already states that the -x >> flag disables authx (which is not the case at present, but is after this patch >> is applied). >> >> I've attached a patch to vstart that 1) changes the mention of authx to cephx >> for consistency and 2) defaults vstart.sh to using cephx with the -x flag now >> serving to disable cephx. > Sounds like a good change, but let's make -x do nothing and -X disable > cephx, so that existing habitual typing of -x doesn't lead to failure. > > Also, we should fix the auth none usage at some point. :) > > sage diff --git a/src/vstart.sh b/src/vstart.sh index 7aaad49..0b24e44 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -21,7 +21,7 @@ ip="" nodaemon=0 smallmds=0 overwrite_conf=1 -cephx=0 +cephx=1 #turn cephx on by default MON_ADDR="" @@ -43,7 +43,8 @@ usage=$usage"\t--nodaemon: use ceph-run as wrapper for mon/osd/mds\n" usage=$usage"\t--smallmds: limit mds cache size\n" usage=$usage"\t-m ip:port\t\tspecify monitor address\n" usage=$usage"\t-k keep old configuration files\n" -usage=$usage"\t-x disable authx\n" +usage=$usage"\t-x enable cephx (on by default)\n" +usage=$usage"\t-X disable cephx\n" usage=$usage"\t-o config\t\t add extra config parameters to mds section\n" usage_exit() { @@ -117,7 +118,10 @@ case $1 in shift ;; -x ) - cephx=1 + cephx=1 # this is on be default, flag exists for historical consistency + ;; + -X ) + cephx=0 ;; -k ) overwrite_conf=0