From patchwork Wed Jan 18 11:25:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gurucharan Shetty X-Patchwork-Id: 716851 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 3v3gLf3S4kz9snk for ; Thu, 19 Jan 2017 08:38:02 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B4775B93; Wed, 18 Jan 2017 21:37:59 +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 39C5EB8E for ; Wed, 18 Jan 2017 21:37:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 31B8D1F0 for ; Wed, 18 Jan 2017 21:37:57 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id 19so1817792pfo.3 for ; Wed, 18 Jan 2017 13:37:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=duyUORWSOxeuF3Anc/mdmibPiBseyA+gQOLydTwWYMg=; b=uj2gwgBntTk/nQdk8Ub9wbH1IEpRrz1RCjQYsiONWuMBE6AHAsWTNu/lQjQ4iCdsor 46Y0D1rJnGsKzszKWqIy6s2CWKP3Ovd+pXR/vfC99xDTwmtN8H2KFKJ5aLXWIfoRN1Vc sh6IMiDQcoe7LfKv7zWqUFD8wEKSk3KKmuh5VLxRimT2h3WrhcWo/IywmQ5IKdVEBHWV jwvXFUQ6NGWFI6ahe/8JyrkuRJAywYeIuAutsnqHe041LCA/KWDiaiWDs6O/sriXpKY1 8xt4t3H0EQC2jcmQk2LHul3m7benf12qIy3ivgQz9/tAJ06trNfxS0/EIgnC6B4PtXVN DHhA== X-Gm-Message-State: AIkVDXLckfIQJ3xZdCJvgqp+HojyWOv2qOuDyjNYf5tJ24u6Ka4rVlhigMpFbjGfQM3wlg== X-Received: by 10.99.137.199 with SMTP id v190mr4338188pgd.120.1484775476671; Wed, 18 Jan 2017 13:37:56 -0800 (PST) Received: from ubuntu.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id 89sm2948215pfo.40.2017.01.18.13.37.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jan 2017 13:37:56 -0800 (PST) From: Gurucharan Shetty To: dev@openvswitch.org Date: Wed, 18 Jan 2017 03:25:29 -0800 Message-Id: <1484738729-4219-1-git-send-email-guru@ovn.org> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ovn-ctl: Add bootstrap ovn-controller CA certificate option. 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 ovn-controller accepts the option --bootstrap-ca-cert. With this commit, ovn-ctl will let user pass a value for that via --ovn-controller-ssl-bootstrap-ca-cert option. Bootstrapping is useful for ovn-controller as you don't have to copy the controller's certificate (self-signed or otherwise) to every host. Signed-off-by: Gurucharan Shetty Acked-by: Ben Pfaff Acked-by: Lance Richardson --- ovn/utilities/ovn-ctl | 20 ++++++++++++++++++-- ovn/utilities/ovn-ctl.8.xml | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ovn/utilities/ovn-ctl b/ovn/utilities/ovn-ctl index 90d0463..a3bdad1 100755 --- a/ovn/utilities/ovn-ctl +++ b/ovn/utilities/ovn-ctl @@ -220,22 +220,36 @@ start_northd () { start_controller () { set ovn-controller "unix:$DB_SOCK" set "$@" $OVN_CONTROLLER_LOG - if test X"$OVN_CONTROLLER_SSL_CERT" != X; then + if test X"$OVN_CONTROLLER_SSL_KEY" != X; then set "$@" --private-key=$OVN_CONTROLLER_SSL_KEY + fi + if test X"$OVN_CONTROLLER_SSL_CERT" != X; then set "$@" --certificate=$OVN_CONTROLLER_SSL_CERT + fi + if test X"$OVN_CONTROLLER_SSL_CA_CERT" != X; then set "$@" --ca-cert=$OVN_CONTROLLER_SSL_CA_CERT fi + if test X"$OVN_CONTROLLER_SSL_BOOTSTRAP_CA_CERT" != X; then + set "$@" --bootstrap-ca-cert=$OVN_CONTROLLER_SSL_BOOTSTRAP_CA_CERT + fi 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 - if test X"$OVN_CONTROLLER_SSL_CERT" != X; then + if test X"$OVN_CONTROLLER_SSL_KEY" != X; then set "$@" --private-key=$OVN_CONTROLLER_SSL_KEY + fi + if test X"$OVN_CONTROLLER_SSL_CERT" != X; then set "$@" --certificate=$OVN_CONTROLLER_SSL_CERT + fi + if test X"$OVN_CONTROLLER_SSL_CA_CERT" != X; then set "$@" --ca-cert=$OVN_CONTROLLER_SSL_CA_CERT fi + if test X"$OVN_CONTROLLER_SSL_BOOTSTRAP_CA_CERT" != X; then + set "$@" --bootstrap-ca-cert=$OVN_CONTROLLER_SSL_BOOTSTRAP_CA_CERT + fi OVS_RUNDIR=${OVN_RUNDIR} start_daemon "$OVN_CONTROLLER_PRIORITY" "$OVN_CONTROLLER_WRAPPER" "$@" } @@ -335,6 +349,7 @@ set_defaults () { OVN_CONTROLLER_SSL_KEY="" OVN_CONTROLLER_SSL_CERT="" OVN_CONTROLLER_SSL_CA_CERT="" + OVN_CONTROLLER_SSL_BOOTSTRAP_CA_CERT="" DB_SB_CREATE_INSECURE_REMOTE="no" DB_NB_CREATE_INSECURE_REMOTE="no" @@ -384,6 +399,7 @@ Options: --ovn-controller-ssl-key=KEY OVN Southbound SSL private key file --ovn-controller-ssl-cert=CERT OVN Southbound SSL certificate file --ovn-controller-ssl-ca-cert=CERT OVN Southbound SSL CA certificate file + --ovn-controller-ssl-bootstrap-ca-cert=CERT Bootstrapped OVN Southbound SSL CA certificate file --ovn-manage-ovsdb=yes|no Whether or not the OVN databases should be automatically started and stopped along with ovn-northd. The default is "yes". If diff --git a/ovn/utilities/ovn-ctl.8.xml b/ovn/utilities/ovn-ctl.8.xml index c4884f8..7b090ae 100644 --- a/ovn/utilities/ovn-ctl.8.xml +++ b/ovn/utilities/ovn-ctl.8.xml @@ -48,6 +48,7 @@

--ovn-controller-ssl-key=KEY

--ovn-controller-ssl-cert=CERT

--ovn-controller-ssl-ca-cert=CERT

+

--ovn-controller-ssl-bootstrap-ca-cert=CERT

Address and port options

--db-nb-sync-from-addr=IP ADDRESS