From patchwork Thu Jul 28 16:53:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Moats X-Patchwork-Id: 653824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3s0dGt24Jjz9t1W for ; Fri, 29 Jul 2016 02:53:39 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id F1A8710C3E; Thu, 28 Jul 2016 09:53:34 -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 D75C510C2C for ; Thu, 28 Jul 2016 09:53:33 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 6AFE71E03FE for ; Thu, 28 Jul 2016 10:53:33 -0600 (MDT) X-ASG-Debug-ID: 1469724812-09eadd7ae82bfd50001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id q9L2Lhe9ehvm6imx (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 28 Jul 2016 10:53:32 -0600 (MDT) X-Barracuda-Envelope-From: stack@tombstone-01.cloud.svl.ibm.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mx0a-001b2d01.pphosted.com) (148.163.158.5) by mx1-pf1.cudamail.com with ESMTPS (AES256-SHA encrypted); 28 Jul 2016 16:53:31 -0000 Received-SPF: none (mx1-pf1.cudamail.com: domain at tombstone-01.cloud.svl.ibm.com does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 148.163.158.5 X-Barracuda-RBL-IP: 148.163.158.5 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u6SGnQ4M135916 for ; Thu, 28 Jul 2016 12:53:31 -0400 Received: from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159]) by mx0a-001b2d01.pphosted.com with ESMTP id 24eycms0ab-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 28 Jul 2016 12:53:30 -0400 Received: from localhost by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Jul 2016 10:53:27 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 28 Jul 2016 10:53:15 -0600 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: stack@tombstone-01.cloud.svl.ibm.com Received: from b01cxnp22036.gho.pok.ibm.com (b01cxnp22036.gho.pok.ibm.com [9.57.198.26]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 21B0A1FF0046 for ; Thu, 28 Jul 2016 10:52:57 -0600 (MDT) Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u6SGrDi761407314; Thu, 28 Jul 2016 16:53:13 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B975EAE056; Thu, 28 Jul 2016 12:53:13 -0400 (EDT) Received: from localhost (unknown [9.30.183.40]) by b01ledav005.gho.pok.ibm.com (Postfix) with SMTP id 62D56AE034; Thu, 28 Jul 2016 12:53:13 -0400 (EDT) Received: by localhost (Postfix, from userid 1000) id 082B1601AA; Thu, 28 Jul 2016 16:53:06 +0000 (UTC) X-CudaMail-Envelope-Sender: stack@tombstone-01.cloud.svl.ibm.com From: Ryan Moats To: dev@openvswitch.org X-CudaMail-MID: CM-E1-727041148 X-CudaMail-DTE: 072816 X-CudaMail-Originating-IP: 148.163.158.5 Date: Thu, 28 Jul 2016 16:53:03 +0000 X-ASG-Orig-Subj: [##CM-E1-727041148##][PATCH v2] ovn: Add ovn-controller-vtep debian package X-Mailer: git-send-email 1.9.1 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16072816-0028-0000-0000-000005435016 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005537; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000177; SDB=6.00736710; UDB=6.00346014; IPR=6.00509304; BA=6.00004629; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012094; XFM=3.00000011; UTC=2016-07-28 16:53:26 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16072816-0029-0000-0000-00002DED7AC3 Message-Id: <1469724783-24077-1-git-send-email-rmoats@us.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-28_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607280167 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1469724812 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 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: 1.35 X-Barracuda-Spam-Status: No, SCORE=1.35 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_RULE_7580G, BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.31580 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.75 BSF_RULE_7580G Custom Rule 7580G 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Subject: [ovs-dev] [PATCH v2] ovn: Add ovn-controller-vtep debian package 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" Having a separate debian package for deploying the ovn-controller-vtep binary enables the ability to assign specific nodes the role of communicating with VTEP enabled TORs. Change-Id: Ia36aea7d89bd011a57918820b2a9f6e3469b3e04 Signed-off-by: Ryan Moats --- debian/automake.mk | 5 +++- debian/control | 15 +++++++++++ debian/ovn-controller-vtep.init | 53 +++++++++++++++++++++++++++++++++++++ debian/ovn-controller-vtep.install | 1 + debian/ovn-controller-vtep.manpages | 1 + ovn/utilities/ovn-ctl | 51 ++++++++++++++++++++++++++++------- ovn/utilities/ovn-ctl.8.xml | 3 +++ 7 files changed, 119 insertions(+), 10 deletions(-) create mode 100755 debian/ovn-controller-vtep.init create mode 100644 debian/ovn-controller-vtep.install create mode 100644 debian/ovn-controller-vtep.manpages diff --git a/debian/automake.mk b/debian/automake.mk index 7b5b3aa..73b4d00 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -58,9 +58,12 @@ EXTRA_DIST += \ debian/ovn-central.postinst \ debian/ovn-central.postrm \ debian/ovn-central.template \ + debian/ovn-controller-vtep.init \ + debian/ovn-controller-vtep.install \ + debian/ovn-controller-vtep.manpages \ debian/ovn-common.install \ debian/ovn-common.manpages \ - debian/ovn-docker.install \ + debian/ovn-docker.install \ debian/ovn-host.dirs \ debian/ovn-host.init \ debian/ovn-host.install \ diff --git a/debian/control b/debian/control index 9ba6e6b..480ff5c 100644 --- a/debian/control +++ b/debian/control @@ -113,6 +113,21 @@ Description: OVN common components . ovn-common provides components required by other OVN packages. +Package: ovn-controller-vtep +Architecture: linux-any +Depends: ovn-common (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: OVN vtep controller + ovn-controller-vtep is the local controller daemon in + OVN, the Open Virtual Network, for VTEP enabled physical switches. + It connects up to the OVN Southbound database over the OVSDB protocol, + and down to the VTEP database over the OVSDB protocol. + . + ovn-controller-vtep provides the ovn-controller-vtep binary for controlling + vtep gateways. + + Package: ovn-host Architecture: linux-any Depends: openvswitch-switch (= ${binary:Version}), diff --git a/debian/ovn-controller-vtep.init b/debian/ovn-controller-vtep.init new file mode 100755 index 0000000..acba329 --- /dev/null +++ b/debian/ovn-controller-vtep.init @@ -0,0 +1,53 @@ +#! /bin/sh +# +### BEGIN INIT INFO +# Provides: ovn-controller-vtep +# Required-Start: openvswitch-switch $remote_fs $syslog +# Required-Stop: $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: OVN Controller for VTEP enabled devices +# Description: ovn-controller-vtep provides the userspace +# components and utilities for OVN that can be run on +# hosts taht connect to VTEP enabled devices. +### END INIT INFO + +test -x /usr/bin/ovn-controller-vtep || exit 0 +test -x /usr/share/openvswitch/scripts/ovn-ctl || exit 0 + +_SYSTEMCTL_SKIP_REDIRECT=yes + +. /usr/share/openvswitch/scripts/ovs-lib +if [ -e /etc/default/ovn-controller-vtep ]; then + . /etc/default/ovn-controller-vtep +fi + +start () { + set /usr/share/openvswitch/scripts/ovn-ctl ${1-start_controller_vtep} + set "$@" $OVN_CTL_OPTS + "$@" || exit $? +} + +case $1 in + start) + start + ;; + stop | force-stop) + /usr/share/openvswitch/scripts/ovn-ctl stop_controller_vtep + ;; + restart) + start restart_controller_vtep + ;; + status) + /usr/share/openvswitch/scripts/ovn-ctl status_controller_vtep + exit $? + ;; + reload | force-reload) + ;; + *) + echo "Usage: $0 {start|stop|reload|force-reload|restart|status}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/ovn-controller-vtep.install b/debian/ovn-controller-vtep.install new file mode 100644 index 0000000..1d208f3 --- /dev/null +++ b/debian/ovn-controller-vtep.install @@ -0,0 +1 @@ +usr/bin/ovn-controller-vtep diff --git a/debian/ovn-controller-vtep.manpages b/debian/ovn-controller-vtep.manpages new file mode 100644 index 0000000..7873017 --- /dev/null +++ b/debian/ovn-controller-vtep.manpages @@ -0,0 +1 @@ +ovn/controller-vtep/ovn-controller-vtep.8 diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl index dad6db6..a4a9817 100755 --- a/ovn/utilities/ovn-ctl +++ b/ovn/utilities/ovn-ctl @@ -114,6 +114,12 @@ start_controller () { OVS_RUNDIR=${OVN_RUNDIR} start_daemon "$OVN_CONTROLLER_PRIORITY" "$OVN_CONTROLLER_WRAPPER" "$@" } +start_controller_vtep () { + set ovn-controller-vtep "unix:$DB_SOCK" + set "$@" -vconsole:emer -vsyslog:err -vfile:info + OVS_RUNDIR=${OVN_RUNDIR} start_daemon "$OVN_CONTROLLER_PRIORITY" "$OVN_CONTROLLER_WRAPPER" "$@" +} + ## ---- ## ## stop ## ## ---- ## @@ -130,6 +136,10 @@ stop_controller () { OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller } +stop_controller_vtep () { + OVS_RUNDIR=${OVN_RUNDIR} stop_daemon ovn-controller-vtep +} + ## ------- ## ## restart ## ## ------- ## @@ -144,6 +154,11 @@ restart_controller () { start_controller } +restart_controller_vtep () { + stop_controller_vtep + start_controller_vtep +} + restart_ovsdb () { stop_ovsdb start_ovsdb @@ -214,15 +229,18 @@ This program is intended to be invoked internally by Open Virtual Network startup scripts. System administrators should not normally invoke it directly. Commands: - start_northd start ovn-northd - start_ovsdb start ovn related ovsdb-server processes - start_controller start ovn-controller - stop_northd stop ovn-northd - stop_ovsdb stop ovn related ovsdb-server processes - stop_controller stop ovn-controller - restart_northd restart ovn-northd - restart_ovsdb restart ovn related ovsdb-server processes - restart_controller restart ovn-controller + start_northd start ovn-northd + start_ovsdb start ovn related ovsdb-server processes + start_controller start ovn-controller + start_controller_vtep start ovn-controller-vtep + stop_northd stop ovn-northd + stop_ovsdb stop ovn related ovsdb-server processes + stop_controller stop ovn-controller + stop_controller_vtep stop ovn-controller-vtep + restart_northd restart ovn-northd + restart_ovsdb restart ovn related ovsdb-server processes + restart_controller restart ovn-controller + restart_controller_vtep restart ovn-controller-vtep Options: --ovn-northd-priority=NICE set ovn-northd's niceness (default: $OVN_NORTHD_PRIORITY) @@ -317,6 +335,9 @@ case $command in start_controller) start_controller ;; + start_controller_vtep) + start_controller_vtep + ;; stop_northd) stop_northd ;; @@ -326,6 +347,12 @@ case $command in stop_controller) stop_controller ;; + stop_controller) + stop_controller + ;; + stop_controller_vtep) + stop_controller_vtep + ;; restart_northd) restart_northd ;; @@ -335,6 +362,9 @@ case $command in restart_controller) restart_controller ;; + restart_controller_vtep) + restart_controller_vtep + ;; status_northd) daemon_status ovn-northd || exit 1 ;; @@ -344,6 +374,9 @@ case $command in status_controller) daemon_status ovn-controller || exit 1 ;; + status_controller_vtep) + daemon_status ovn-controller-vtep || exit 1 + ;; help) usage ;; diff --git a/ovn/utilities/ovn-ctl.8.xml b/ovn/utilities/ovn-ctl.8.xml index 89ad934..b0127da 100644 --- a/ovn/utilities/ovn-ctl.8.xml +++ b/ovn/utilities/ovn-ctl.8.xml @@ -15,10 +15,13 @@
start_northd
start_controller
+
start_controller_vtep
stop_northd
stop_controller
+
stop_controller_vtep
restart_northd
restart_controller
+
restart_controller_vtep

Options