From patchwork Wed Dec 7 06:07:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guoshuai Li X-Patchwork-Id: 703455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tYShH2HDJz9s2G for ; Wed, 7 Dec 2016 17:07:24 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 492B4B92; Wed, 7 Dec 2016 06:07:21 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 8C6E994B for ; Wed, 7 Dec 2016 06:07:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtp2203-239.mail.aliyun.com (smtp2203-239.mail.aliyun.com [121.197.203.239]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 76E2E134 for ; Wed, 7 Dec 2016 06:07:16 +0000 (UTC) X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1655396|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e02c03301; MF=ligs@dtdream.com; NM=1; PH=DS; RN=2; RT=2; SR=0; TI=SMTPD_---.7Ghokqu_1481090833; Received: from localhost.localdomain(mailfrom:ligs@dtdream.com ip:111.198.29.132) by smtp.aliyun-inc.com(10.147.41.138); Wed, 07 Dec 2016 14:07:14 +0800 From: Guoshuai Li To: ovs-dev@openvswitch.org Date: Wed, 7 Dec 2016 14:07:05 +0800 Message-Id: <20161207060705.13828-1-ligs@dtdream.com> X-Mailer: git-send-email 2.10.1.windows.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Guoshuai Li Subject: [ovs-dev] [PATCH] ovn: Fix the wrong return, otherwise it will cause the document more than one space. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Guoshuai Li --- IntegrationGuide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IntegrationGuide.rst b/IntegrationGuide.rst index d34e9ed..11e77ba 100644 --- a/IntegrationGuide.rst +++ b/IntegrationGuide.rst @@ -240,8 +240,8 @@ Whenever the active server dies, pacemaker is responsible to promote one of the backup servers to be active. Both ovn-controller and ovn-northd needs the ip-address at which the active server is listening. With pacemaker changing the node at which the active server is run, it is not efficient to instruct all the -ovn-controllers and the ovn-northd to listen to the latest active server's ip- -address +ovn-controllers and the ovn-northd to listen to the latest active server's +ip-address. This problem can be solved by using a native ocf resource agent `ocf:heartbeat:IPaddr2`. The IPAddr2 resource agent is just a resource with an