From patchwork Fri May 9 08:36:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wido den Hollander X-Patchwork-Id: 4140791 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 21C57BFF02 for ; Fri, 9 May 2014 08:36:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53374202E6 for ; Fri, 9 May 2014 08:36:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C82EF202DD for ; Fri, 9 May 2014 08:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756258AbaEIIgY (ORCPT ); Fri, 9 May 2014 04:36:24 -0400 Received: from smtp01.mail.pcextreme.nl ([109.72.87.137]:38220 "EHLO smtp01.mail.pcextreme.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756063AbaEIIgV (ORCPT ); Fri, 9 May 2014 04:36:21 -0400 Received: from wido-laptop.pcextreme.nl (unknown [79.99.132.138]) by smtp01.mail.pcextreme.nl (Postfix) with ESMTPA id 46F177611C; Fri, 9 May 2014 10:39:58 +0200 (CEST) From: Wido den Hollander To: ceph-devel@vger.kernel.org Cc: Wido den Hollander Subject: [PATCH 2/2] Set ms_bind_ipv6 to true when IPv6 is used Date: Fri, 9 May 2014 10:36:15 +0200 Message-Id: <1399624575-4772-1-git-send-email-wido@widodh.nl> X-Mailer: git-send-email 1.7.9.5 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Wido den Hollander --- ceph_deploy/new.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ceph_deploy/new.py b/ceph_deploy/new.py index fc4c5f4..e573128 100644 --- a/ceph_deploy/new.py +++ b/ceph_deploy/new.py @@ -91,9 +91,11 @@ def new(args): ip = net.get_nonlocal_ip(host) LOG.debug('Monitor %s at %s', name, ip) mon_initial_members.append(name) + ms_ipv6 = False try: socket.inet_pton(socket.AF_INET6, ip) mon_host.append("[" + ip + "]") + ms_ipv6 = True except socket.error: mon_host.append(ip) @@ -106,6 +108,10 @@ def new(args): cfg.set('global', 'mon initial members', ', '.join(mon_initial_members)) # no spaces here, see http://tracker.newdream.net/issues/3145 cfg.set('global', 'mon host', ','.join(mon_host)) + + if ms_ipv6 == True: + LOG.debug('Monitors are IPv6, binding Messenger traffic on IPv6') + cfg.set('global', 'ms bind ipv6', 'true') # override undesirable defaults, needed until bobtail