aboutsummaryrefslogtreecommitdiff
path: root/rhel
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-06-15 10:26:34 -0700
committerBen Pfaff <blp@nicira.com>2012-06-15 10:26:34 -0700
commit87378a8770f54f1efaf91920077c65c45398f227 (patch)
tree2e1e662ad940a99297be750183cac08aa42b58c7 /rhel
parentf4d458c55089f36710e5c2f36b578d76702b2789 (diff)
xenserver, rhel: Enable extra ovs-ctl options from init scripts.
This is useful for passing wrapper script options and possibly for other purposes. Bug #11889. Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'rhel')
-rwxr-xr-xrhel/etc_init.d_openvswitch1
-rw-r--r--rhel/usr_share_openvswitch_scripts_sysconfig.template4
2 files changed, 5 insertions, 0 deletions
diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index 6642f280..ad7579cd 100755
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -48,6 +48,7 @@ start () {
if test X"$BRCOMPAT" = Xyes; then
set "$@" --brcompat
fi
+ set "$@" $OVS_CTL_OPTS
"$@"
$ovs_ctl --protocol=gre enable-protocol
diff --git a/rhel/usr_share_openvswitch_scripts_sysconfig.template b/rhel/usr_share_openvswitch_scripts_sysconfig.template
index 812060d3..cad1f531 100644
--- a/rhel/usr_share_openvswitch_scripts_sysconfig.template
+++ b/rhel/usr_share_openvswitch_scripts_sysconfig.template
@@ -21,3 +21,7 @@
# BRCOMPAT: If 'yes' compatibility mode will be enabled.
# BRCOMPAT=yes
+
+# OVS_CTL_OPTS: Extra options to pass to ovs-ctl. This is, for example,
+# a suitable place to specify --ovs-vswitchd-wrapper=valgrind.
+# OVS_CTL_OPTS=