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 <bschanmu@redhat.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Russell Bryant <russell@ovn.org>

diff --git a/rhel/.gitignore b/rhel/.gitignore
index 164bb66..02b79b9 100644 (file)
--- 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
index dc30715..dc53986 100644 (file)
--- 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/rhel/usr_lib_systemd_system_ovn-controller.service b/rhel/usr_lib_systemd_system_ovn-controller.service
deleted file mode 100644 (file)
index 6b53ced..0000000
--- a/rhel/usr_lib_systemd_system_ovn-controller.service
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# You may override the following variables to customize ovn-controller behavior:
-#
-#   OVS_DB - Set this variable to the location of the ovsdb server that is
-#            serving the Open_vSwitch database for the local ovs-vswitchd.
-#            See the manpage for ovn-controller for more details on the
-#            format for the db location.
-#
-
-[Unit]
-Description=OVN controller daemon
-After=syslog.target
-Requires=openvswitch.service
-After=openvswitch.service
-
-[Service]
-Type=simple
-Environment=OVS_RUNDIR=%t/openvswitch
-Environment=OVS_DB=unix:%t/openvswitch/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}

diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service.in b/rhel/usr_lib_systemd_system_ovn-controller.service.in
new file mode 100644 (file)
index 0000000..8373eb2
--- /dev/null
+++ b/rhel/usr_lib_systemd_system_ovn-controller.service.in
@@ -0,0 +1,22 @@
+#
+# You may override the following variables to customize ovn-controller behavior:
+#
+#   OVS_DB - Set this variable to the location of the ovsdb server that is
+#            serving the Open_vSwitch database for the local ovs-vswitchd.
+#            See the manpage for ovn-controller for more details on the
+#            format for the db location.
+#
+
+[Unit]
+Description=OVN controller daemon
+After=syslog.target
+Requires=openvswitch.service
+After=openvswitch.service
+
+[Service]
+Type=simple
+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}