From patchwork Mon Dec 5 22:26:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Bryant X-Patchwork-Id: 702912 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 3tXfVs1FRPz9sfH for ; Tue, 6 Dec 2016 09:26:29 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 76C22B50; Mon, 5 Dec 2016 22:26:25 +0000 (UTC) X-Original-To: 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 35167B1E for ; Mon, 5 Dec 2016 22:26:24 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B28C715C for ; Mon, 5 Dec 2016 22:26:23 +0000 (UTC) Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35AF5C04B93D; Mon, 5 Dec 2016 22:26:23 +0000 (UTC) Received: from t460s.redhat.com (ovpn-112-38.phx2.redhat.com [10.3.112.38]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB5MQLTR028180; Mon, 5 Dec 2016 17:26:22 -0500 From: Russell Bryant To: dev@openvswitch.org Date: Mon, 5 Dec 2016 17:26:20 -0500 Message-Id: <20161205222620.29114-1-russell@ovn.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 05 Dec 2016 22:26:23 +0000 (UTC) X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2] ovn-controller(8): ovn-remote must be an ovsdb remote. 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 Document that the value of the ovn-remote configuration option must be in the form of an ovsdb remote as previously documented in this man page. This came up on IRC where someone trying OVN put a hostname here and observed that it did not work. Signed-off-by: Russell Bryant Acked-by: Ben Pfaff --- ovn/controller/ovn-controller.8.xml | 9 ++------- ovn/controller/ovn-controller.c | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) v1->v2: - Drop old docs and a code comment that said you couldn't change ovn-remote at runtime - Update patch to specify that the value is an ovsdb remote (not an IP address as specified in v1) diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml index 5f51cb1..9f4dad1 100644 --- a/ovn/controller/ovn-controller.8.xml +++ b/ovn/controller/ovn-controller.8.xml @@ -93,13 +93,8 @@

The OVN database that this system should connect to for its - configuration. -

- -

- Currently, ovn-controller does not support changing this - setting mid-run. If the value needs to change, the daemon must be - restarted. (This behavior should be improved.) + configuration, in one of the same forms documented above for the + ovs-database.

diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index fea7841..4fbf455 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -204,10 +204,7 @@ get_chassis_id(const struct ovsdb_idl *ovs_idl) } /* Retrieves the OVN Southbound remote location from the - * "external-ids:ovn-remote" key in 'ovs_idl' and returns a copy of it. - * - * XXX ovn-controller does not support this changing mid-run, but that should - * be addressed later. */ + * "external-ids:ovn-remote" key in 'ovs_idl' and returns a copy of it. */ static char * get_ovnsb_remote(struct ovsdb_idl *ovs_idl) {