rhel: Use ovn-ctl to ovn-controller service

Trying to revert the changes caused by 8520dee to travis build failures Signed-off-by: Babu Shanmugam <[email protected]>
russellb · Mar 8, 2016 · 9863bb9 · 9863bb9
1 parent bef3f46
commit 9863bb9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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/..._systemd_system_ovn-controller.service.in → ...lib_systemd_system_ovn-controller.service b/..._systemd_system_ovn-controller.service.in → ...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