From 6091132bf720b7cedc1780f86c489a7dfe6e6c8e Mon Sep 17 00:00:00 2001 From: Christian Trautman Date: Tue, 19 Jul 2016 09:48:30 -0400 Subject: ovs-appctl fix: Fixes ovs-appctl by placing pid file appropriately ovs-appctl was broken due to a previous commit which changed the location of the ovs-vswitchd pid file. This fixes it by placing the pid back in the default location where ovs-appctl is looking for. JIRA: VSPERF-315 Change-Id: I4ae87ad566acb69ac9d565a3a77865f5a6861b93 Signed-off-by: MartinX Klozik Signed-off-by: Christian Trautman --- vswitches/ovs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vswitches/ovs.py b/vswitches/ovs.py index 659f7cfa..243619b6 100644 --- a/vswitches/ovs.py +++ b/vswitches/ovs.py @@ -38,8 +38,8 @@ class IVSwitchOvs(IVSwitch, tasks.Process): see the interface. """ _logfile = os.path.join(settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD')) - _ovsdb_pidfile_path = os.path.join(settings.getValue('LOG_DIR'), "ovsdb_pidfile.pid") - _vswitchd_pidfile_path = os.path.join(settings.getValue('LOG_DIR'), "vswitchd_pidfile.pid") + _ovsdb_pidfile_path = os.path.join(_OVS_VAR_DIR, "ovsdb-server.pid") + _vswitchd_pidfile_path = os.path.join(_OVS_VAR_DIR, "ovs-vswitchd.pid") _proc_name = 'ovs-vswitchd' def __init__(self): -- cgit 1.2.3-korg