diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-06-15 10:26:34 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-06-15 10:26:34 -0700 |
| commit | 87378a8770f54f1efaf91920077c65c45398f227 (patch) | |
| tree | 2e1e662ad940a99297be750183cac08aa42b58c7 /xenserver | |
| parent | f4d458c55089f36710e5c2f36b578d76702b2789 (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 'xenserver')
| -rwxr-xr-x | xenserver/etc_init.d_openvswitch | 1 | ||||
| -rw-r--r-- | xenserver/usr_share_openvswitch_scripts_sysconfig.template | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index b2248b7a..a1998251 100755 --- a/xenserver/etc_init.d_openvswitch +++ b/xenserver/etc_init.d_openvswitch @@ -76,6 +76,7 @@ start () { touch /var/run/openvswitch.booted set "$@" --delete-bridges fi + set "$@" $OVS_CTL_OPTS "$@" start_ovs_xapi_sync diff --git a/xenserver/usr_share_openvswitch_scripts_sysconfig.template b/xenserver/usr_share_openvswitch_scripts_sysconfig.template index bb85d67a..2c084529 100644 --- a/xenserver/usr_share_openvswitch_scripts_sysconfig.template +++ b/xenserver/usr_share_openvswitch_scripts_sysconfig.template @@ -18,3 +18,7 @@ # system memory pressure in extraordinary situations, such as multiple # concurrent VM import operations. # VSWITCHD_MLOCKALL=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= |