From patchwork Fri Sep 14 19:49:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 970067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NoIveGQ2"; dkim-atps=neutral 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 42BmLm0kybz9s3l for ; Sat, 15 Sep 2018 05:49:35 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8AFACCE6; Fri, 14 Sep 2018 19:49:32 +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 EB18EBC6 for ; Fri, 14 Sep 2018 19:49:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B44CE3CC for ; Fri, 14 Sep 2018 19:49:29 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id l63-v6so4859498pga.7 for ; Fri, 14 Sep 2018 12:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=OdEcasxqXyvXuh2Txl+OFqk65UN4U5Q2aj/BouN80JU=; b=NoIveGQ2O5x9yLl125gtxT7NVYn1zsuHXPonyRQisq1xhOnC1jhKHkas8+tCy5ndmj YAzkr1FXsg19Hi1PrO+yUQ2xXtHw3rVc5VF6HgrBDj25rSpOLakMnOw6CtSextQael8m +LHfWIVy7JCTKfXKhs2DoAi2RMyZ8pyUP7MuexSTkKyVYNxLaBBqRWZ4wTasxLcd974Y EsdNnQnXs6pj7qFDZySYR0enZYs6YxCV5wD+zzvZmYQx1+Q8KB7CUcgzn5kSbNQU30c0 OT9NnCxcX3rOuMu7mlddJNKwWjC3QsbfENtFg60Spgs/VovoEiygMr3DKwKjZiH4Nkwd OERA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OdEcasxqXyvXuh2Txl+OFqk65UN4U5Q2aj/BouN80JU=; b=Odp7npwPHhxamOOwSTUPudYkIo85v2HKkYSY8H0TgSZM8ZUMbu5jo3pUqkkUAPZ5h5 BVPEIqYGLKx4CbUR5Gvwqi356YStt5GQnJ0VH2eRqBDHeFiUPZSitSOk/phDbQOPNX1c tRmjUQfV/vR3YTwHHDUOWXor5oNZh6Z94zLQ1o3YbTGhIdnweB7kq1uEKoAIWOdHcxUH iazNoOXSJEcx82m8Czvs4Zwp6E4sIzqMPRQ+TjanOdH8/ljSDBfUnP4QKYdN4nzLvbqn YeW/H251sA6XLzvq6yJ6W9kOhqNR0cjeze+U0huJ+lp1Yovkpgta5o5XIMSxGa8djxk3 dJyQ== X-Gm-Message-State: APzg51B8s0gbS1xlR/fzKuEfTzKRHJkJ8fsNVoAbfaXX2j+Z5pDVjn0Y ncmqely9mQXI7yJYeAgoTyRrZWbZ X-Google-Smtp-Source: ANB0VdaPii0fjZtHT7ANOfmvCTCf7uiDXAZ9gviotCrRo18VU099qhLAdnrph05NcjZmbWUqEtT9hg== X-Received: by 2002:a63:1a5a:: with SMTP id a26-v6mr13319875pgm.9.1536954568924; Fri, 14 Sep 2018 12:49:28 -0700 (PDT) Received: from vm1-rhel74-local.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id l84-v6sm13857507pfg.3.2018.09.14.12.49.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 12:49:27 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Fri, 14 Sep 2018 12:49:23 -0700 Message-Id: <1536954563-103152-1-git-send-email-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE 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 v1] rhel: retain OVS_CTL_OPTS for systemd service files 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 OVS init.d script calls ovs-ctl with $OVS_CTL_OPTS defined in the config file. This variable is replaced by OPTIONS in systemd service files. This patch addes $OVS_CTL_OPTS back to be passed along with $OPTIONS for backward compatibility. VMware-BZ: #2036847 Signed-off-by: Martin Xu CC: Aaron Conole --- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++-- rhel/usr_lib_systemd_system_ovsdb-server.service | 4 ++-- rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in index 11b34c6..e4dbdf3 100644 --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in @@ -21,10 +21,10 @@ ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ ${OVSUSER} \ - start $OPTIONS + start $OPTIONS $OVS_CTL_OPTS ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server stop ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovsdb-server \ --no-monitor --system-id=random \ ${OVSUSER} \ - restart $OPTIONS + restart $OPTIONS $OVS_CTL_OPTS TimeoutSec=300 diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service index 70da1ec..09f946b 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service @@ -16,10 +16,10 @@ EnvironmentFile=-/run/openvswitch/useropts ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovs-vswitchd --no-monitor --system-id=random \ ${OVSUSER} \ - start $OPTIONS + start $OPTIONS $OVS_CTL_OPTS ExecStop=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd stop ExecReload=/usr/share/openvswitch/scripts/ovs-ctl --no-ovs-vswitchd \ ${OVSUSER} \ - --no-monitor restart $OPTIONS + --no-monitor restart $OPTIONS $OVS_CTL_OPTS RuntimeDirectory=openvswitch RuntimeDirectoryMode=0755 diff --git a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template index 9364454..0ce5b6b 100644 --- a/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template +++ b/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template @@ -23,5 +23,10 @@ # OPTIONS="" +# OVS_CTL_OPTS: Extra options to pass along with OPTIONS to ovs-ctl. +# This flag is retained for backward compatibility. For example, +# user can specify --ovs-vswitchd-wrapper=valgrind. +# OVS_CTL_OPTS= + # Uncomment and set the OVS User/Group value #OVS_USER_ID="openvswitch:openvswitch"