| Message ID | 20190508115348.7937-1-jcaamano@suse.com |
|---|---|
| State | Accepted |
| Commit | ea8519fcc764532ab7dfa3a86d683365eff6451d |
| Headers | show |
| Series | [ovs-dev,1/4] ovn-controller-vtep: Fix wrong value for ovnsb-db argument | expand |
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 <jcaamano@suse.com> 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.
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 <blp@ovn.org> To: jcaamano@suse.de Cc: dev@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 <jcaamano@suse.com> 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.
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 <blp@ovn.org> > To: jcaamano@suse.de > Cc: dev@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 <jcaamano@suse.com> > > 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. >
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, --help display 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 \
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 <jcaamano@suse.com> --- 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(-)