From patchwork Wed Sep 9 12:37:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Bryant X-Patchwork-Id: 515825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id 7C2131400CB for ; Wed, 9 Sep 2015 22:37:23 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 7D3BC109B8; Wed, 9 Sep 2015 05:37:22 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id B5CE4109B7 for ; Wed, 9 Sep 2015 05:37:20 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 01E621E035A for ; Wed, 9 Sep 2015 06:37:20 -0600 (MDT) X-ASG-Debug-ID: 1441802238-09eadd7da5f6610001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id oRZqU005cBvoOXr6 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 09 Sep 2015 06:37:18 -0600 (MDT) X-Barracuda-Envelope-From: rbryant@redhat.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mx1.redhat.com) (209.132.183.28) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 9 Sep 2015 12:37:18 -0000 Received-SPF: error (mx1-pf2.cudamail.com: error in processing during lookup of redhat.com: DNS problem) X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-Barracuda-RBL-IP: 209.132.183.28 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 7AD748E6E6 for ; Wed, 9 Sep 2015 12:37:17 +0000 (UTC) Received: from x1c.redhat.com ([10.3.112.3]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t89CbFLD030288; Wed, 9 Sep 2015 08:37:16 -0400 X-CudaMail-Envelope-Sender: rbryant@redhat.com From: Russell Bryant To: dev@openvswitch.org X-CudaMail-MID: CM-E2-908015747 X-CudaMail-DTE: 090915 X-CudaMail-Originating-IP: 209.132.183.28 Date: Wed, 9 Sep 2015 08:37:14 -0400 X-ASG-Orig-Subj: [##CM-E2-908015747##][PATCH] rhel: s/OVN_DB/OVS_DB/ in ovn-controller unit. Message-Id: <1441802234-9968-1-git-send-email-rbryant@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-GBUdb-Analysis: 0, 209.132.183.28, Ugly c=0.264319 p=-0.0769231 Source Normal X-MessageSniffer-Rules: 0-0-0-5053-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1441802238 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.22370 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: fbl@redhat.com Subject: [ovs-dev] [PATCH] rhel: s/OVN_DB/OVS_DB/ in ovn-controller unit. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" I added a variable called OVN_DB, but had mixed up what this parameter to ovn-controller was for. This parameter is the location of the db for the local ovs-vswitchd. It then gets the OVN database location from *that* db. It seems fine to keep the env var in case someone needs to override it for some reason, but correct the name and description of what it is. Signed-off-by: Russell Bryant Acked-by: Flavio Leitner --- rhel/usr_lib_systemd_system_ovn-controller.service | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service b/rhel/usr_lib_systemd_system_ovn-controller.service index 48dd194..6b53ced 100644 --- a/rhel/usr_lib_systemd_system_ovn-controller.service +++ b/rhel/usr_lib_systemd_system_ovn-controller.service @@ -1,9 +1,10 @@ # # You may override the following variables to customize ovn-controller behavior: # -# OVN_DB - Set this variable to the location of the ovsdb server that is -# serving the OVN_Southbound database. See the manpage for -# ovn-controller for more details on the format for the db location. +# OVS_DB - Set this variable to the location of the ovsdb server that is +# serving the Open_vSwitch database for the local ovs-vswitchd. +# See the manpage for ovn-controller for more details on the +# format for the db location. # [Unit] @@ -15,7 +16,7 @@ After=openvswitch.service [Service] Type=simple Environment=OVS_RUNDIR=%t/openvswitch -Environment=OVN_DB=unix:%t/openvswitch/db.sock +Environment=OVS_DB=unix:%t/openvswitch/db.sock ExecStart=/usr/bin/ovn-controller -vconsole:emer -vsyslog:err -vfile:info \ --log-file=/var/log/openvswitch/ovn-controller.log \ - --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid ${OVN_DB} + --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid ${OVS_DB}