diff options
author | Robert Wojciechowicz <robertx.wojciechowicz@intel.com> | 2017-03-09 13:59:51 +0000 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2017-04-07 15:07:52 -0700 |
commit | 34d4f74d0489d72018da9ff989abf1f2aa57af45 (patch) | |
tree | bbe7f397c5532a90a14faf614974321148009c6e /utilities | |
parent | 1b996ac917392b66cff5b7bb660c94ceb897ba57 (diff) | |
download | openvswitch-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 'utilities')
-rwxr-xr-x | utilities/ovs-ctl.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in index e234937b1..575ffa039 100755 --- a/utilities/ovs-ctl.in +++ b/utilities/ovs-ctl.in @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -110,6 +110,8 @@ set_system_ids () { set "$@" external-ids:hostname="\"$(hostname -f)\"" + set "$@" external-ids:rundir="\"$rundir\"" + if test X"$SYSTEM_TYPE" != X; then set "$@" system-type="\"$SYSTEM_TYPE\"" else |