diff options
| author | bschanmu@redhat.com <bschanmu@redhat.com> | 2016-03-08 18:45:02 +0530 |
|---|---|---|
| committer | Russell Bryant <russell@ovn.org> | 2016-03-08 08:46:12 -0500 |
| commit | 1b4993133f281a9b181aedc9f56930ab4b4de65a (patch) | |
| tree | 7fe7cda68049ad26e01194e1294667cc083ea469 /rhel | |
| parent | bef3f465bcd5f81823c7fb8750e3f639486b3587 (diff) | |
| download | openvswitch-1b4993133f281a9b181aedc9f56930ab4b4de65a.tar.gz | |
rhel: Use ovn-ctl to ovn-controller service
Trying to revert the changes caused by 8520deefbf208b24518c2bf67baad6d230f39dc0
to travis build failures
Signed-off-by: Babu Shanmugam <bschanmu@redhat.com>
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 (renamed from rhel/usr_lib_systemd_system_ovn-controller.service.in) | 10 |
3 files changed, 4 insertions, 10 deletions
diff --git a/rhel/.gitignore b/rhel/.gitignore index 02b79b946..164bb6671 100644 --- a/rhel/.gitignore +++ b/rhel/.gitignore @@ -4,4 +4,3 @@ 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 dc53986ce..dc30715b9 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -28,7 +28,6 @@ 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 @@ -52,8 +51,6 @@ $(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.in b/rhel/usr_lib_systemd_system_ovn-controller.service index 8373eb294..9bd2f6674 100644 --- a/rhel/usr_lib_systemd_system_ovn-controller.service.in +++ b/rhel/usr_lib_systemd_system_ovn-controller.service @@ -14,9 +14,7 @@ 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} +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/share/openvswitch/scripts/ovn-ctl start_controller +ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_controller |