[ovs-dev,2/2] rhel: Fix ovn database dir optional on first run
diff mbox series

Message ID 20190610165812.23908-2-jcaamano@suse.com
State New
Headers show
Series
  • [ovs-dev,1/2] rhel: set useropts optional for ovsdb-server
Related show

Commit Message

Jaime Caamaño Ruiz June 10, 2019, 4:58 p.m. UTC
OVN database directory is createid on first run so make ownership
handling optional.

Fixes: 94e1e8be3187 ("rhel: run ovn with the same user as ovs")
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>
---
 rhel/usr_lib_systemd_system_ovn-northd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Pfaff June 10, 2019, 8:49 p.m. UTC | #1
On Mon, Jun 10, 2019 at 06:58:12PM +0200, Jaime Caamaño Ruiz wrote:
> OVN database directory is createid on first run so make ownership
> handling optional.
> 
> Fixes: 94e1e8be3187 ("rhel: run ovn with the same user as ovs")
> Signed-off-by: Jaime Caamaño Ruiz <jcaamano@suse.com>

Thanks, I applied these to master.  If they should be backported, let me
know.

Patch
diff mbox series

diff --git a/rhel/usr_lib_systemd_system_ovn-northd.service b/rhel/usr_lib_systemd_system_ovn-northd.service
index ff510fbde..ea8c191e3 100644
--- a/rhel/usr_lib_systemd_system_ovn-northd.service
+++ b/rhel/usr_lib_systemd_system_ovn-northd.service
@@ -25,7 +25,7 @@  RemainAfterExit=yes
 Environment=OVS_RUNDIR=%t/openvswitch OVS_DBDIR=/var/lib/openvswitch
 EnvironmentFile=-/etc/sysconfig/ovn-northd
 EnvironmentFile=/run/openvswitch.useropts
-ExecStartPre=/usr/bin/chown -R ${OVS_USER_ID} ${OVS_DBDIR}
+ExecStartPre=-/usr/bin/chown -R ${OVS_USER_ID} ${OVS_DBDIR}
 ExecStart=/usr/share/openvswitch/scripts/ovn-ctl \
           --ovs-user=${OVS_USER_ID} --ovn-user=${OVS_USER_ID} \
           start_northd $OVN_NORTHD_OPTS