Use 'RUNDIR' from make for rhel/ovn-controller.service

Perviously it was using the platform's runtime directory which can be different from the runtime directory of ovsdb-server started by the openvswitch service Signed-off-by: Babu Shanmugam <[email protected]> Acked-by: Flavio Leitner <[email protected]> Signed-off-by: Russell Bryant <[email protected]>
russellb · Mar 7, 2016 · 8520dee · 8520dee
1 parent 6019cb6
commit 8520dee
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rhel/.gitignore b/rhel/.gitignore
@@ -4,3 +4,4 @@ openvswitch-kmod-rhel6.spec
 openvswitch-kmod-fedora.spec
 openvswitch.spec
 openvswitch-fedora.spec
+usr_lib_systemd_system_ovn-controller.service
diff --git a/rhel/automake.mk b/rhel/automake.mk
@@ -28,6 +28,7 @@ EXTRA_DIST += \
 	rhel/usr_lib_systemd_system_openvswitch.service \
 	rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \
 	rhel/usr_lib_systemd_system_ovn-controller.service \
+	rhel/usr_lib_systemd_system_ovn-controller.service.in \
 	rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
 	rhel/usr_lib_systemd_system_ovn-northd.service
 
@@ -51,6 +52,8 @@ $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config
 $(srcdir)/rhel/openvswitch-fedora.spec: rhel/openvswitch-fedora.spec.in $(top_builddir)/config.status
 	$(update_rhel_spec)
 
+$(srcdir)/rhel/usr_lib_systemd_system_ovn-controller.service: rhel/usr_lib_systemd_system_ovn-controller.service.in $(top_builddir)/config.status
+
 RPMBUILD_TOP := $(abs_top_builddir)/rpm/rpmbuild
 
 # Build user-space RPMs

diff --git a/...lib_systemd_system_ovn-controller.service → ..._systemd_system_ovn-controller.service.in b/...lib_systemd_system_ovn-controller.service → ..._systemd_system_ovn-controller.service.in
@@ -15,8 +15,8 @@ After=openvswitch.service
 
 [Service]
 Type=simple
-Environment=OVS_RUNDIR=%t/openvswitch
-Environment=OVS_DB=unix:%t/openvswitch/db.sock
+Environment=OVS_RUNDIR=@RUNDIR@
+Environment=OVS_DB=unix:@RUNDIR@/db.sock
 ExecStart=/usr/bin/ovn-controller -vconsole:emer -vsyslog:err -vfile:info \
           --log-file=/var/log/openvswitch/ovn-controller.log \
           --no-chdir --pidfile=${OVS_RUNDIR}/ovn-controller.pid ${OVS_DB}