summaryrefslogtreecommitdiff
path: root/vswitchd
diff options
context:
space:
mode:
authorRobert Wojciechowicz <robertx.wojciechowicz@intel.com>2017-03-09 13:59:51 +0000
committerBen Pfaff <blp@ovn.org>2017-04-07 15:07:52 -0700
commit34d4f74d0489d72018da9ff989abf1f2aa57af45 (patch)
treebbe7f397c5532a90a14faf614974321148009c6e /vswitchd
parent1b996ac917392b66cff5b7bb660c94ceb897ba57 (diff)
downloadopenvswitch-34d4f74d0489d72018da9ff989abf1f2aa57af45.tar.gz
ovs-ctl: Expose openvswitch run directory through ovsdb.
When using vhost-user client or server mode with OpenStack, Neutron needs to be able to construct the fully qualified socket path and pass it to Nova. While the relative vhost-user socket directory is exposed via the Open_vSwitch table in other_config:vhost-sock-dir, the openvswitch run directory that it is relative to is not. This patch adds it to the Open_vSwitch table as external_ids:rundir. Signed-off-by: Robert Wojciechowicz <robertx.wojciechowicz@intel.com> Acked-by: Sean K Mooney <sean.k.mooney@intel.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'vswitchd')
-rw-r--r--vswitchd/vswitch.xml18
1 files changed, 13 insertions, 5 deletions
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 14297bf9a..870c81318 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -77,6 +77,14 @@
qualified domain name since version 2.6.2.
</column>
+ <column name="external_ids" key="rundir">
+ In Open vSwitch 2.8 and later, the run directory of the running Open
+ vSwitch daemon. This directory is used for runtime state such as
+ control and management sockets. The value of <ref
+ column="other_config" key="vhost-sock-dir"/> is relative to this
+ directory.
+ </column>
+
<column name="other_config" key="stats-update-interval"
type='{"type": "integer", "minInteger": 5000}'>
<p>
@@ -288,13 +296,13 @@
<column name="other_config" key="vhost-sock-dir"
type='{"type": "string"}'>
<p>
- Specifies the path to the vhost-user unix domain socket files. This
- path must exist and be a subdirectory tree of the Open vSwitch
- run directory.
+ Specifies a relative path from <ref column="external_ids"
+ key="rundir"/> to the vhost-user unix domain socket files. If this
+ value is unset, the sockets are put directly in <ref
+ column="external_ids" key="rundir"/>.
</p>
<p>
- Defaults to the working directory of the application. Changing this
- value requires restarting the daemon.
+ Changing this value requires restarting the daemon.
</p>
</column>