diff options
Diffstat (limited to 'rhel')
| -rw-r--r-- | rhel/automake.mk | 16 | ||||
| -rw-r--r-- | rhel/ovn-fedora.spec.in | 432 | ||||
| -rw-r--r-- | rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml | 7 | ||||
| -rw-r--r-- | rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml | 6 | ||||
| -rw-r--r-- | rhel/usr_lib_systemd_system_ovn-controller-vtep.service | 50 | ||||
| -rw-r--r-- | rhel/usr_lib_systemd_system_ovn-controller.service | 34 | ||||
| -rw-r--r-- | rhel/usr_lib_systemd_system_ovn-northd.service | 35 |
7 files changed, 1 insertions, 579 deletions
diff --git a/rhel/automake.mk b/rhel/automake.mk index 1c5bf153c..c75406e05 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -23,8 +23,6 @@ EXTRA_DIST += \ rhel/openvswitch.spec.in \ rhel/openvswitch-fedora.spec \ rhel/openvswitch-fedora.spec.in \ - rhel/ovn-fedora.spec \ - rhel/ovn-fedora.spec.in \ rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \ rhel/usr_share_openvswitch_scripts_sysconfig.template \ rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ @@ -34,12 +32,7 @@ EXTRA_DIST += \ rhel/usr_lib_systemd_system_ovsdb-server.service \ rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service \ - rhel/usr_lib_systemd_system_ovn-controller.service \ - rhel/usr_lib_systemd_system_ovn-controller-vtep.service \ - rhel/usr_lib_systemd_system_ovn-northd.service \ - rhel/usr_lib_systemd_system_openvswitch-ipsec.service \ - rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \ - rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml + rhel/usr_lib_systemd_system_openvswitch-ipsec.service DISTCLEANFILES += rhel/usr_lib_systemd_system_ovs-vswitchd.service @@ -74,13 +67,6 @@ rpm-fedora: dist $(srcdir)/rhel/openvswitch-fedora.spec -D "_topdir ${RPMBUILD_TOP}" \ -ba $(srcdir)/rhel/openvswitch-fedora.spec -rpm-fedora-ovn: dist $(srcdir)/rhel/ovn-fedora.spec - ${MKDIR_P} ${RPMBUILD_TOP}/SOURCES - cp ${DIST_ARCHIVES} ${RPMBUILD_TOP}/SOURCES - rpmbuild ${RPMBUILD_OPT} \ - -D "_topdir ${RPMBUILD_TOP}" \ - -ba $(srcdir)/rhel/ovn-fedora.spec - # Build kernel datapath RPM rpm-fedora-kmod: dist $(srcdir)/rhel/openvswitch-kmod-fedora.spec ${MKDIR_P} ${RPMBUILD_TOP}/SOURCES diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in deleted file mode 100644 index 2ecc629f2..000000000 --- a/rhel/ovn-fedora.spec.in +++ /dev/null @@ -1,432 +0,0 @@ -# Spec file for Open Virtual Network (OVN). - -# Copyright (C) 2018 Red Hat, Inc. -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without warranty of any kind. -# -# If tests have to be skipped while building, specify the '--without check' -# option. For example: -# rpmbuild -bb --without check rhel/ovn-fedora.spec -# - -# If libcap-ng isn't available and there is no need for running OVS -# as regular user, specify the '--without libcapng' -%bcond_without libcapng - -# Enable Python 3 by specifying '--with build_python3'. -# This is enabled by default for versions of the distribution that -# have Python 3 by default (Fedora > 22). -%bcond_with build_python3 - -# Enable PIE, bz#955181 -%global _hardened_build 1 - -# some distros (e.g: RHEL-7) don't define _rundir macro yet -# Fedora 15 onwards uses /run as _rundir -%if 0%{!?_rundir:1} -%define _rundir /run -%endif - -# define the python package prefix based on distribution version so that we can -# simultaneously support RHEL-based and later Fedora versions in this spec file. -%if 0%{?fedora} >= 25 -%define _py2 python2 -%endif - -%if 0%{?rhel} || 0%{?fedora} < 25 -%define _py2 python -%endif - -Name: ovn -Summary: Open Virtual Network support -Group: System Environment/Daemons -URL: http://www.openvswitch.org/ -Version: @VERSION@ -Obsoletes: openvswitch-ovn-common < %{?epoch:%{epoch}:}%{version}-%{release} -Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} - -# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the -# lib/sflow*.[ch] files are SISSL -License: ASL 2.0 and LGPLv2+ and SISSL -Release: 1%{?dist} -Source: http://openvswitch.org/releases/openvswitch-%{version}.tar.gz - -BuildRequires: gcc gcc-c++ -BuildRequires: autoconf automake libtool -BuildRequires: systemd-units openssl openssl-devel -BuildRequires: %{_py2}-devel -%if 0%{?fedora} > 22 || %{with build_python3} -BuildRequires: python3-devel -%endif -BuildRequires: desktop-file-utils -BuildRequires: groff graphviz -BuildRequires: checkpolicy, selinux-policy-devel -BuildRequires: /usr/bin/sphinx-build -# make check dependencies -BuildRequires: %{_py2}-twisted%{?rhel:-core} %{_py2}-zope-interface %{_py2}-six -BuildRequires: procps-ng -%if %{with libcapng} -BuildRequires: libcap-ng libcap-ng-devel -%endif -BuildRequires: unbound unbound-devel - -Requires: openssl hostname iproute module-init-tools openvswitch - -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - -# to skip running checks, pass --without check -%bcond_without check - -%description -OVN, the Open Virtual Network, is a system to support virtual network -abstraction. OVN complements the existing capabilities of OVS to add -native support for virtual network abstractions, such as virtual L2 and L3 -overlays and security groups. - -%package central -Summary: Open Virtual Network support -License: ASL 2.0 -Requires: ovn -Requires: firewalld-filesystem -Obsoletes: openvswitch-ovn-central -Provides: openvswitch-ovn-central = %{?epoch:%{epoch}:}%{version}-%{release} - -%description central -OVN DB servers and ovn-northd running on a central node. - -%package host -Summary: Open Virtual Network support -License: ASL 2.0 -Requires: ovn -Requires: firewalld-filesystem -Obsoletes: openvswitch-ovn-host -Provides: openvswitch-ovn-host = %{?epoch:%{epoch}:}%{version}-%{release} - -%description host -OVN controller running on each host. - -%package vtep -Summary: Open Virtual Network support -License: ASL 2.0 -Requires: ovn -Obsoletes: openvswitch-ovn-vtep -Provides: openvswitch-ovn-vtep = %{?epoch:%{epoch}:}%{version}-%{release} - -%description vtep -OVN vtep controller - -%package docker -Summary: Open Virtual Network support -License: ASL 2.0 -Requires: ovn %{_py2}-openvswitch -Obsoletes: openvswitch-ovn-docker -Provides: openvswitch-ovn-docker = %{?epoch:%{epoch}:}%{version}-%{release} - -%description docker -Docker network plugins for OVN. - -%prep -%setup -n openvswitch-%{version} - -%build -%configure \ -%if %{with libcapng} - --enable-libcapng \ -%else - --disable-libcapng \ -%endif - --enable-ssl \ - --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ -%if 0%{?fedora} > 22 || %{with build_python3} - PYTHON3=%{__python3} \ - PYTHON=%{__python2} -%else - PYTHON=%{__python} -%endif - -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -for service in ovn-controller ovn-controller-vtep ovn-northd; do - install -p -D -m 0644 \ - rhel/usr_lib_systemd_system_${service}.service \ - $RPM_BUILD_ROOT%{_unitdir}/${service}.service -done - -rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ - -install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch - -install -d $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ -install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \ - $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml -install -p -m 0644 rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \ - $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml - -install -d -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/ovn -ln -s %{_datadir}/openvswitch/scripts/ovndb-servers.ocf \ - $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers - -# remove OVS unpackages files -rm -f $RPM_BUILD_ROOT%{_bindir}/ovs* -rm -f $RPM_BUILD_ROOT%{_bindir}/vtep-ctl -rm -f $RPM_BUILD_ROOT%{_sbindir}/ovs* -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ovs* -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/ovs* -rm -f $RPM_BUILD_ROOT%{_mandir}/man5/vtep* -rm -f $RPM_BUILD_ROOT%{_mandir}/man7/ovs* -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/ovs* -rm -f $RPM_BUILD_ROOT%{_mandir}/man8/vtep* -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/ovs* -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/vswitch.ovsschema -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/vtep.ovsschema -rm -f $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/ovs* -rm -rf $RPM_BUILD_ROOT%{_datadir}/openvswitch/bugtool-plugins -rm -f $RPM_BUILD_ROOT%{_includedir}/openvswitch/* -rm -f $RPM_BUILD_ROOT%{_includedir}/openflow/* -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc -rm -f $RPM_BUILD_ROOT%{_includedir}/openvswitch/* -rm -f $RPM_BUILD_ROOT%{_includedir}/openflow/* -rm -f $RPM_BUILD_ROOT%{_includedir}/ovn/* -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ovs-appctl-bashcomp.bash -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/ovs-vsctl-bashcomp.bash -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/openvswitch - -%check -%if %{with check} - touch resolv.conf - export OVS_RESOLV_CONF=$(pwd)/resolv.conf - if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :; - else - cat tests/testsuite.log - exit 1 - fi -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%pre central -if [ $1 -eq 1 ] ; then - # Package install. - /bin/systemctl status ovn-northd.service >/dev/null - ovn_status=$? - rpm -ql openvswitch-ovn-central > /dev/null - if [[ "$?" = "0" && "$ovn_status" = "0" ]]; then - # ovn-northd service is running which means old openvswitch-ovn-central - # is already installed and it will be cleaned up. So start ovn-northd - # service when posttrans central is called. - touch %{_localstatedir}/lib/rpm-state/ovn-northd - fi -fi - -%pre host -if [ $1 -eq 1 ] ; then - # Package install. - /bin/systemctl status ovn-controller.service >/dev/null - ovn_status=$? - rpm -ql openvswitch-ovn-host > /dev/null - if [[ "$?" = "0" && "$ovn_status" = "0" ]]; then - # ovn-controller service is running which means old - # openvswitch-ovn-host is installed and it will be cleaned up. So - # start ovn-controller service when posttrans host is called. - touch %{_localstatedir}/lib/rpm-state/ovn-controller - fi -fi - -%pre vtep -if [ $1 -eq 1 ] ; then - # Package install. - /bin/systemctl status ovn-controller-vtep.service >/dev/null - ovn_status=$? - rpm -ql openvswitch-ovn-vtep > /dev/null - if [[ "$?" = "0" && "$ovn_status" = "0" ]]; then - # ovn-controller-vtep service is running which means old - # openvswitch-ovn-vtep is installed and it will be cleaned up. So - # start ovn-controller-vtep service when posttrans host is called. - touch %{_localstatedir}/lib/rpm-state/ovn-controller-vtep - fi -fi - -%preun central -%if 0%{?systemd_preun:1} - %systemd_preun ovn-northd.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-northd.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-northd.service >/dev/null 2>&1 || : - fi -%endif - -%preun host -%if 0%{?systemd_preun:1} - %systemd_preun ovn-controller.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-controller.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-controller.service >/dev/null 2>&1 || : - fi -%endif - -%preun vtep -%if 0%{?systemd_preun:1} - %systemd_preun ovn-controller-vtep.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable ovn-controller-vtep.service >/dev/null 2>&1 || : - /bin/systemctl stop ovn-controller-vtep.service >/dev/null 2>&1 || : - fi -%endif - -%post central -%if 0%{?systemd_post:1} - %systemd_post ovn-northd.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%post host -%if 0%{?systemd_post:1} - %systemd_post ovn-controller.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%post vtep -%if 0%{?systemd_post:1} - %systemd_post ovn-controller-vtep.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -%postun - -%postun central -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-northd.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-northd.service >/dev/null 2>&1 || : - fi -%endif - -%postun host -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-controller.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-controller.service >/dev/null 2>&1 || : - fi -%endif - -%postun vtep -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart ovn-controller-vtep.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart ovn-controller-vtep.service >/dev/null 2>&1 || : - fi -%endif - -%posttrans central -if [ $1 -eq 1 ]; then - # Package install, not upgrade - if [ -e %{_localstatedir}/lib/rpm-state/ovn-northd ]; then - rm %{_localstatedir}/lib/rpm-state/ovn-northd - /bin/systemctl start ovn-northd.service >/dev/null 2>&1 || : - fi -fi - - -%posttrans host -if [ $1 -eq 1 ]; then - # Package install, not upgrade - if [ -e %{_localstatedir}/lib/rpm-state/ovn-controller ]; then - rm %{_localstatedir}/lib/rpm-state/ovn-controller - /bin/systemctl start ovn-controller.service >/dev/null 2>&1 || : - fi -fi - -%posttrans vtep -if [ $1 -eq 1 ]; then - # Package install, not upgrade - if [ -e %{_localstatedir}/lib/rpm-state/ovn-controller-vtep ]; then - rm %{_localstatedir}/lib/rpm-state/ovn-controller-vtep - /bin/systemctl start ovn-controller-vtep.service >/dev/null 2>&1 || : - fi -fi - -%files -%{_bindir}/ovn-nbctl -%{_bindir}/ovn-sbctl -%{_bindir}/ovn-trace -%{_bindir}/ovn-detrace -%{_datadir}/openvswitch/scripts/ovn-ctl -%{_datadir}/openvswitch/scripts/ovndb-servers.ocf -%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show -%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list -%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show -%{_mandir}/man8/ovn-ctl.8* -%{_mandir}/man8/ovn-nbctl.8* -%{_mandir}/man8/ovn-trace.8* -%{_mandir}/man1/ovn-detrace.1* -%{_mandir}/man7/ovn-architecture.7* -%{_mandir}/man8/ovn-sbctl.8* -%{_mandir}/man5/ovn-nb.5* -%{_mandir}/man5/ovn-sb.5* -%{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers - -%files docker -%{_bindir}/ovn-docker-overlay-driver -%{_bindir}/ovn-docker-underlay-driver - -%files central -%{_bindir}/ovn-northd -%{_mandir}/man8/ovn-northd.8* -%config %{_datadir}/openvswitch/ovn-nb.ovsschema -%config %{_datadir}/openvswitch/ovn-sb.ovsschema -%{_unitdir}/ovn-northd.service -%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml - -%files host -%{_bindir}/ovn-controller -%{_mandir}/man8/ovn-controller.8* -%{_unitdir}/ovn-controller.service -%{_prefix}/lib/firewalld/services/ovn-host-firewall-service.xml - -%files vtep -%{_bindir}/ovn-controller-vtep -%{_mandir}/man8/ovn-controller-vtep.8* -%{_unitdir}/ovn-controller-vtep.service - -%changelog -* Thu Dec 20 2018 Numan Siddique <nusiddiq@redhat.com> -- OVS/OVN split. diff --git a/rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml b/rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml deleted file mode 100644 index a005f325c..000000000 --- a/rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<service> - <short>ovn-central-firewall-service</short> - <description>Firewall service for ovn central</description> - <port protocol="tcp" port="6641"/> - <port protocol="tcp" port="6642"/> -</service> diff --git a/rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml b/rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml deleted file mode 100644 index f606890c3..000000000 --- a/rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<service> - <short>ovn-host-firewall-service</short> - <description>Firewall service for ovn host</description> - <port protocol="udp" port="6081"/> -</service> diff --git a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service b/rhel/usr_lib_systemd_system_ovn-controller-vtep.service deleted file mode 100644 index b1e239f57..000000000 --- a/rhel/usr_lib_systemd_system_ovn-controller-vtep.service +++ /dev/null @@ -1,50 +0,0 @@ -# See ovn-controller-vtep(8) for details about ovn-controller-vtep. -# -# You may override the following variables to customize ovn-controller-vtep -# behavior: -# -# OVN_DB - Set this variable to the location of the ovsdb server that is -# serving the OVN_Southbound database. See the manpage for -# ovn-controller-vtep for more details on the format for the db -# location. -# -# VTEP_DB - Set this variable to the location of the ovsdb server that is -# serving the hardware_vtep database. See the manpage for -# ovn-controller-vtep for more details on the format for the db -# location. -# -# To override these variables, you may create a configuration file -# in the /etc/systemd/system/ovn-controller-vtep.d/ directory. For example, -# you could place the following contents in -# /etc/systemd/system/ovn-controller-vtep.d/local.conf: -# -# [System] -# Environment="OVN_DB=unix:/usr/local/var/run/openvswitch/db.sock" "VTEP_DB=unix:/usr/local/var/run/openvswitch/vtep.sock" -# -# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-controller-vtep: -# -# OVN_DB="unix:/usr/local/var/run/openvswitch/db.sock" -# VTEP_DB="unix:/usr/local/var/run/openvswitch/vtep.sock" - -[Unit] -Description=OVN VTEP gateway controller daemon -After=syslog.target -Requires=openvswitch.service -After=openvswitch.service - -[Service] -Type=forking -PIDFile=/var/run/openvswitch/ovn-controller-vtep.pid -Restart=on-failure -Environment=OVN_DB=unix:%t/openvswitch/ovnsb_db.sock -Environment=VTEP_DB=unix:%t/openvswitch/db.sock -EnvironmentFile=-/etc/sysconfig/ovn-controller-vtep -EnvironmentFile=/run/openvswitch.useropts -ExecStart=/usr/share/openvswitch/scripts/ovn-ctl \ - --db-sb-sock=${OVN_DB} --db-sock=${VTEP_DB} \ - --ovn-user=${OVS_USER_ID} \ - start_controller_vtep -ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_controller_vtep - -[Install] -WantedBy=multi-user.target diff --git a/rhel/usr_lib_systemd_system_ovn-controller.service b/rhel/usr_lib_systemd_system_ovn-controller.service deleted file mode 100644 index 335cd5a52..000000000 --- a/rhel/usr_lib_systemd_system_ovn-controller.service +++ /dev/null @@ -1,34 +0,0 @@ -# See ovn-controller(8) for details about ovn-controller. -# -# To customize the ovn-controller service, you may create a configuration file -# in the /etc/systemd/system/ovn-controller.d/ directory. For example, to specify -# additional options to be passed to the "ovn-ctl start_controller" command, you -# could place the following contents in -# /etc/systemd/system/ovn-controller.d/local.conf: -# -# [System] -# Environment="OVN_CONTROLLER_OPTS=--ovn-controller-log=-vconsole:emer -vsyslog:err -vfile:info" -# -# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-controller: -# -# OVN_CONTROLLER_OPTS="--ovn-controller-log=-vconsole:emer -vsyslog:err -vfile:info" - -[Unit] -Description=OVN controller daemon -After=syslog.target -Requires=openvswitch.service -After=openvswitch.service - -[Service] -Type=forking -PIDFile=/var/run/openvswitch/ovn-controller.pid -Restart=on-failure -EnvironmentFile=-/etc/sysconfig/ovn-controller -EnvironmentFile=/run/openvswitch.useropts -ExecStart=/usr/share/openvswitch/scripts/ovn-ctl --no-monitor \ - --ovn-user=${OVS_USER_ID} \ - start_controller $OVN_CONTROLLER_OPTS -ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_controller - -[Install] -WantedBy=multi-user.target diff --git a/rhel/usr_lib_systemd_system_ovn-northd.service b/rhel/usr_lib_systemd_system_ovn-northd.service deleted file mode 100644 index ea8c191e3..000000000 --- a/rhel/usr_lib_systemd_system_ovn-northd.service +++ /dev/null @@ -1,35 +0,0 @@ -# See ovn-northd(8) for details about ovn-northd. -# -# To customize the ovn-northd service, you may create a configuration file -# in the /etc/systemd/system/ovn-northd.d/ directory. For example, to specify -# additional options to be passed to the "ovn-ctl start_northd" command, you -# could place the following contents in -# /etc/systemd/system/ovn-northd.d/local.conf: -# -# [System] -# Environment="OVN_NORTHD_OPTS=--db-nb-sock=/usr/local/var/run/openvswitch/ovnnb_db.sock --db-sb-sock=/usr/local/var/run/openvswitch/ovnsb_db.sock" -# -# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-northd: -# -# OVN_NORTHD_OPTS="--db-nb-sock=/usr/local/var/run/openvswitch/ovnnb_db.sock --db-sb-sock=/usr/local/var/run/openvswitch/ovnsb_db.sock" - -[Unit] -Description=OVN northd management daemon -After=syslog.target -Requires=openvswitch.service -After=openvswitch.service - -[Service] -Type=oneshot -RemainAfterExit=yes -Environment=OVS_RUNDIR=%t/openvswitch OVS_DBDIR=/var/lib/openvswitch -EnvironmentFile=-/etc/sysconfig/ovn-northd -EnvironmentFile=/run/openvswitch.useropts -ExecStartPre=-/usr/bin/chown -R ${OVS_USER_ID} ${OVS_DBDIR} -ExecStart=/usr/share/openvswitch/scripts/ovn-ctl \ - --ovs-user=${OVS_USER_ID} --ovn-user=${OVS_USER_ID} \ - start_northd $OVN_NORTHD_OPTS -ExecStop=/usr/share/openvswitch/scripts/ovn-ctl stop_northd - -[Install] -WantedBy=multi-user.target |