From patchwork Thu Sep 5 06:27:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kirkwood X-Patchwork-Id: 2853938 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F4D59F495 for ; Thu, 5 Sep 2013 06:27:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 738402031A for ; Thu, 5 Sep 2013 06:27:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 547F1202CF for ; Thu, 5 Sep 2013 06:27:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757256Ab3IEG1v (ORCPT ); Thu, 5 Sep 2013 02:27:51 -0400 Received: from bertrand.catalyst.net.nz ([202.78.240.40]:48948 "EHLO mail.catalyst.net.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756660Ab3IEG1v (ORCPT ); Thu, 5 Sep 2013 02:27:51 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.catalyst.net.nz (Postfix) with ESMTP id AF108678D1 for ; Thu, 5 Sep 2013 18:27:47 +1200 (NZST) X-Virus-Scanned: Debian amavisd-new at catalyst.net.nz Received: from mail.catalyst.net.nz ([127.0.0.1]) by localhost (bertrand.catalyst.net.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L8blFkqRphCu for ; Thu, 5 Sep 2013 18:27:46 +1200 (NZST) Received: from [IPv6:2404:130:0:1000:222:4dff:fe88:a586] (unknown [IPv6:2404:130:0:1000:222:4dff:fe88:a586]) (Authenticated sender: mark.kirkwood) by mail.catalyst.net.nz (Postfix) with ESMTPSA id 8CDEB678C1 for ; Thu, 5 Sep 2013 18:27:46 +1200 (NZST) Message-ID: <52282462.9030305@catalyst.net.nz> Date: Thu, 05 Sep 2013 18:27:46 +1200 From: Mark Kirkwood User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: ceph-devel Subject: Re: Ceph-deploy (git from today) fails to create osd on host that does not have a mon References: <52281D10.9090507@catalyst.net.nz> In-Reply-To: <52281D10.9090507@catalyst.net.nz> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 05/09/13 17:56, Mark Kirkwood wrote: > > > [ceph_deploy.osd][DEBUG ] Preparing cluster ceph disks > ceph2:/dev/vdb:/dev/vdc > [ceph_deploy.osd][INFO ] Distro info: Ubuntu 12.04 precise > [ceph_deploy.osd][DEBUG ] Deploying osd to ceph2 > [ceph2][INFO ] write cluster configuration to /etc/ceph/{cluster}.conf > [ceph2][INFO ] keyring file does not exist, creating one at: > /var/lib/ceph/bootstrap-osd/ceph.keyring > [ceph2][INFO ] create mon keyring file > [ceph2][ERROR ] Traceback (most recent call last): > [ceph2][ERROR ] File > "/home/markir/develop/python/ceph-deploy/ceph_deploy/util/decorators.py", > line 10, in inner > [ceph2][ERROR ] File > "/home/markir/develop/python/ceph-deploy/ceph_deploy/osd.py", line 14, > in write_keyring > [ceph2][ERROR ] NameError: global name 'key' is not defined > The attached patch seems to fix it. Cheers Mark diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py index 4cf0b0a..178f737 100644 --- a/ceph_deploy/osd.py +++ b/ceph_deploy/osd.py @@ -48,7 +48,7 @@ def create_osd(conn, logger, cluster, key): pid=conn.modules.os.getpid(), ) - def write_keyring(tmp, path): + def write_keyring(tmp, path, key): """ create mon keyring file """ # file() doesn't let us control access mode from the # beginning, and thus would have a race where attacker can @@ -67,7 +67,7 @@ def create_osd(conn, logger, cluster, key): os.rename(tmp, path) with remote(conn, logger, write_keyring) as remote_func: - remote_func(tmp, path) + remote_func(tmp, path, key) return check_call( conn,