[ovs-dev,v2,1/2] rhel: Fix Environment for ovn-controller-vtep.

The systemd unit for ovn-controller-vtep incorrectly specified
Environment multiple times.  Multiple environment variables must
be specified separated by a space to a single Environment option.

Signed-off-by: Russell Bryant <russell@ovn.org>
---
 rhel/usr_lib_systemd_system_ovn-controller-vtep.service | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

v1->v2:
 - no changes to patch 1

Hi Russell,

On Wed, Nov 23, 2016 at 03:01:23PM -0500, Russell Bryant wrote:
> The systemd unit for ovn-controller-vtep incorrectly specified
> Environment multiple times.  Multiple environment variables must
> be specified separated by a space to a single Environment option.

I'm trying to verify if that is the case. However, according to the
following seems to indicate that the current setup is acceptable.
Perhaps this documentation isn't compatibile with some systemd versions?

https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Environment=

> 
> Signed-off-by: Russell Bryant <russell@ovn.org>
> ---
>  rhel/usr_lib_systemd_system_ovn-controller-vtep.service | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> v1->v2:
>  - no changes to patch 1
> 
> diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> index 717ff12..26d4d9a 100644
> --- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> +++ b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> @@ -29,9 +29,7 @@ After=openvswitch.service
>  
>  [Service]
>  Type=simple
> -Environment=OVS_RUNDIR=%t/openvswitch
> -Environment=OVN_DB=unix:%t/openvswitch/db.sock
> -Environment=VTEP_DB=unix:%t/openvswitch/db.sock
> +Environment=OVS_RUNDIR=%t/openvswitch OVN_DB=unix:%t/openvswitch/db.sock VTEP_DB=unix:%t/openvswitch/db.sock
>  ExecStart=/usr/bin/ovn-controller-vtep -vconsole:emer -vsyslog:err -vfile:info \
>            --log-file=/var/log/openvswitch/ovn-controller-vtep.log \
>            --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller-vtep.pid \
> -- 
> 2.9.3
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>

On Fri, Nov 25, 2016 at 9:14 AM, Simon Horman <simon.horman@netronome.com>
wrote:

> Hi Russell,
>
> On Wed, Nov 23, 2016 at 03:01:23PM -0500, Russell Bryant wrote:
> > The systemd unit for ovn-controller-vtep incorrectly specified
> > Environment multiple times.  Multiple environment variables must
> > be specified separated by a space to a single Environment option.
>
> I'm trying to verify if that is the case. However, according to the
> following seems to indicate that the current setup is acceptable.
> Perhaps this documentation isn't compatibile with some systemd versions?
>
> https://www.freedesktop.org/software/systemd/man/systemd.
> exec.html#Environment=
>
>
I think you're right and I had just read the documentation wrong when I was
looking at this.  Consider this patch dropped.


> >
> > Signed-off-by: Russell Bryant <russell@ovn.org>
> > ---
> >  rhel/usr_lib_systemd_system_ovn-controller-vtep.service | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > v1->v2:
> >  - no changes to patch 1
> >
> > diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> > index 717ff12..26d4d9a 100644
> > --- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> > +++ b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
> > @@ -29,9 +29,7 @@ After=openvswitch.service
> >
> >  [Service]
> >  Type=simple
> > -Environment=OVS_RUNDIR=%t/openvswitch
> > -Environment=OVN_DB=unix:%t/openvswitch/db.sock
> > -Environment=VTEP_DB=unix:%t/openvswitch/db.sock
> > +Environment=OVS_RUNDIR=%t/openvswitch OVN_DB=unix:%t/openvswitch/db.sock
> VTEP_DB=unix:%t/openvswitch/db.sock
> >  ExecStart=/usr/bin/ovn-controller-vtep -vconsole:emer -vsyslog:err
> -vfile:info \
> >            --log-file=/var/log/openvswitch/ovn-controller-vtep.log \
> >            --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller-vtep.pid \
> > --
> > 2.9.3
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
>