diff options
| author | bschanmu@redhat.com <bschanmu@redhat.com> | 2016-03-07 10:33:34 +0530 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-03-07 09:35:39 -0500 |
| commit | 8520deefbf208b24518c2bf67baad6d230f39dc0 (patch) | |
| tree | 6ed67585077394f33c95433746a63b93615a6190 /rhel | |
| parent | 6019cb63956dc87afd130c31ac17137d1304a931 (diff) | |
| download | openvswitch-8520deefbf208b24518c2bf67baad6d230f39dc0.tar.gz | |
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>
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/.gitignore | 1 | ||||
| -rw-r--r-- | rhel/automake.mk | 3 | ||||
| -rw-r--r-- | rhel/usr_lib_systemd_system_ovn-controller.service.in (renamed from rhel/usr_lib_systemd_system_ovn-controller.service) | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/rhel/.gitignore b/rhel/.gitignore index 164bb6671..02b79b946 100644 --- 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 dc30715b9..dc53986ce 100644 --- 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.in index 6b53ced9d..8373eb294 100644 --- a/rhel/usr_lib_systemd_system_ovn-controller.service +++ b/rhel/usr_lib_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} |