[ovs-dev] [PATCH] xenserver, rhel: Enable extra ovs-ctl options from init scripts.

[Ben Pfaff]

Thanks, I pushed this to master.

On Fri, Jun 15, 2012 at 11:52:20AM -0700, Justin Pettit wrote:
> Looks good to me.
> 
> --Justin
> 
> 
> On Jun 15, 2012, at 10:28 AM, Ben Pfaff wrote:
> 
> > This is useful for passing wrapper script options and possibly for other
> > purposes.
> > 
> > Bug #11889.
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> > I forgot to deal with these earlier.
> > 
> > This seeme straightforward enough, but I have not tested it.
> > 
> > rhel/etc_init.d_openvswitch                        |    1 +
> > ...sr_share_openvswitch_scripts_sysconfig.template |    4 ++++
> > xenserver/etc_init.d_openvswitch                   |    1 +
> > ...sr_share_openvswitch_scripts_sysconfig.template |    4 ++++
> > 4 files changed, 10 insertions(+), 0 deletions(-)
> > 
> > diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
> > index 6642f28..ad7579c 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 812060d..cad1f53 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=
> > diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
> > index b2248b7..a199825 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 bb85d67..2c08452 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=
> > -- 
> > 1.7.2.5
> > 
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>