summaryrefslogtreecommitdiffstats
path: root/src/ovs
diff options
context:
space:
mode:
Diffstat (limited to 'src/ovs')
-rw-r--r--src/ovs/daemon.py4
-rw-r--r--src/ovs/ofctl.py2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/ovs/daemon.py b/src/ovs/daemon.py
index 0d518ea9..09735600 100644
--- a/src/ovs/daemon.py
+++ b/src/ovs/daemon.py
@@ -31,8 +31,8 @@ _OVSDB_TOOL_BIN = os.path.join(
_OVSDB_SERVER_BIN = os.path.join(
settings.getValue('OVS_DIR'), 'ovsdb', 'ovsdb-server')
-_OVS_VAR_DIR = '/usr/local/var/run/openvswitch/'
-_OVS_ETC_DIR = '/usr/local/etc/openvswitch/'
+_OVS_VAR_DIR = settings.getValue('OVS_VAR_DIR')
+_OVS_ETC_DIR = settings.getValue('OVS_ETC_DIR')
_LOG_FILE_VSWITCHD = os.path.join(
settings.getValue('LOG_DIR'), settings.getValue('LOG_FILE_VSWITCHD'))
diff --git a/src/ovs/ofctl.py b/src/ovs/ofctl.py
index 2aae1ec8..c052f85c 100644
--- a/src/ovs/ofctl.py
+++ b/src/ovs/ofctl.py
@@ -32,8 +32,6 @@ _OVS_VSCTL_BIN = os.path.join(settings.getValue('OVS_DIR'), 'utilities',
_OVS_OFCTL_BIN = os.path.join(settings.getValue('OVS_DIR'), 'utilities',
'ovs-ofctl')
-_OVS_VAR_DIR = '/usr/local/var/run/openvswitch/'
-
_OVS_BRIDGE_NAME = settings.getValue('VSWITCH_BRIDGE_NAME')
class OFBase(object):