Re: [ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value for ovnsb-db argument

2019-06-10 Thread Ben Pfaff
This process is fine as is.

On Mon, Jun 10, 2019 at 06:26:33PM +0200, Jaime Caamaño Ruiz wrote:
> Hello Ben
> 
> I have a couple of follow up fixes for this series. Sorry for the
> inconvinience. Let me know if you wish to handle this differently (i.e.
> revert and comprehensive new patches).
> 
> BR
> Jaime.
> 
> -Original Message-
> From: Ben Pfaff 
> To: jcaam...@suse.de
> Cc: d...@openvswitch.org
> Subject: Re: [ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value
> for ovnsb-db argument
> Date: Sun, 9 Jun 2019 17:27:06 -0700
> 
> On Wed, May 08, 2019 at 01:53:45PM +0200, Jaime Caamaño Ruiz wrote:
> > Fix help output of ovn-controller-vtep that was suggesting the
> > openvswitch database instead of the ovn southbound database for the
> > ovnsb-db argument.
> > 
> > Also fix the corresponding systemd unit that was passing the
> > openvswitch
> > database instead of the ovn southbound database for the ovnsb-db
> > argument.
> > 
> > Signed-off-by: Jaime Caamaño Ruiz 
> 
> Thank you for the bug fixes.  I applied this series to master.  If you
> think that it should be backported to earlier release versions, please
> let me know.
> 
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value for ovnsb-db argument

2019-06-10 Thread Jaime Caamaño Ruiz
Hello Ben

I have a couple of follow up fixes for this series. Sorry for the
inconvinience. Let me know if you wish to handle this differently (i.e.
revert and comprehensive new patches).

BR
Jaime.

-Original Message-
From: Ben Pfaff 
To: jcaam...@suse.de
Cc: d...@openvswitch.org
Subject: Re: [ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value
for ovnsb-db argument
Date: Sun, 9 Jun 2019 17:27:06 -0700

On Wed, May 08, 2019 at 01:53:45PM +0200, Jaime Caamaño Ruiz wrote:
> Fix help output of ovn-controller-vtep that was suggesting the
> openvswitch database instead of the ovn southbound database for the
> ovnsb-db argument.
> 
> Also fix the corresponding systemd unit that was passing the
> openvswitch
> database instead of the ovn southbound database for the ovnsb-db
> argument.
> 
> Signed-off-by: Jaime Caamaño Ruiz 

Thank you for the bug fixes.  I applied this series to master.  If you
think that it should be backported to earlier release versions, please
let me know.

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


Re: [ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value for ovnsb-db argument

2019-06-09 Thread Ben Pfaff
On Wed, May 08, 2019 at 01:53:45PM +0200, Jaime Caamaño Ruiz wrote:
> Fix help output of ovn-controller-vtep that was suggesting the
> openvswitch database instead of the ovn southbound database for the
> ovnsb-db argument.
> 
> Also fix the corresponding systemd unit that was passing the openvswitch
> database instead of the ovn southbound database for the ovnsb-db
> argument.
> 
> Signed-off-by: Jaime Caamaño Ruiz 

Thank you for the bug fixes.  I applied this series to master.  If you
think that it should be backported to earlier release versions, please
let me know.
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


[ovs-dev] [PATCH 1/4] ovn-controller-vtep: Fix wrong value for ovnsb-db argument

2019-05-08 Thread Jaime Caamaño Ruiz
Fix help output of ovn-controller-vtep that was suggesting the
openvswitch database instead of the ovn southbound database for the
ovnsb-db argument.

Also fix the corresponding systemd unit that was passing the openvswitch
database instead of the ovn southbound database for the ovnsb-db
argument.

Signed-off-by: Jaime Caamaño Ruiz 
---
 ovn/controller-vtep/ovn-controller-vtep.c   | 2 +-
 rhel/usr_lib_systemd_system_ovn-controller-vtep.service | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ovn/controller-vtep/ovn-controller-vtep.c 
b/ovn/controller-vtep/ovn-controller-vtep.c
index 1fc6c8b2d..292a3f464 100644
--- a/ovn/controller-vtep/ovn-controller-vtep.c
+++ b/ovn/controller-vtep/ovn-controller-vtep.c
@@ -253,7 +253,7 @@ Options:\n\
   -h, --helpdisplay this help message\n\
   -o, --options list available options\n\
   -V, --version display version information\n\
-", program_name, program_name, default_db(), default_db());
+", program_name, program_name, default_db(), default_sb_db());
 stream_usage("database", true, false, true);
 daemon_usage();
 vlog_usage();
diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service 
b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
index 4ca684ac0..d6bfef1d4 100644
--- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
+++ b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service
@@ -36,7 +36,7 @@ After=openvswitch.service
 Type=simple
 Restart=on-failure
 Environment=OVS_RUNDIR=%t/openvswitch
-Environment=OVN_DB=unix:%t/openvswitch/db.sock
+Environment=OVN_DB=unix:%t/openvswitch/ovnsb_db.sock
 Environment=VTEP_DB=unix:%t/openvswitch/db.sock
 EnvironmentFile=-/etc/sysconfig/ovn-controller-vtep
 ExecStart=/usr/bin/ovn-controller-vtep -vconsole:emer -vsyslog:err -vfile:info 
\
-- 
2.16.4

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev