Add support to manage ovn-ic services with systemd

rhel/automake.mk

@@ -14,6 +14,7 @@ EXTRA_DIST += \
 	rhel/usr_lib_systemd_system_ovn-controller.service \
 	rhel/usr_lib_systemd_system_ovn-controller-vtep.service \
 	rhel/usr_lib_systemd_system_ovn-ic.service \
+	rhel/usr_lib_systemd_system_ovn-ic-db.service \
 	rhel/usr_lib_systemd_system_ovn-northd.service \
 	rhel/usr_lib_firewalld_services_ovn-central-firewall-service.xml \
 	rhel/usr_lib_firewalld_services_ovn-host-firewall-service.xml \

rhel/ovn-fedora.spec.in

@@ -84,14 +84,6 @@ Provides: openvswitch-ovn-central = %{?epoch:%{epoch}:}%{version}-%{release}
 %description central
 OVN DB servers and ovn-northd running on a central node.
 
-%package ic
-Summary: Open Virtual Network interconnection support
-License: ASL 2.0
-Requires: ovn
-
-%description ic
-OVN IC DB servers and ovn-ic.
-
 %package host
 Summary: Open Virtual Network support
 License: ASL 2.0
@@ -169,7 +161,7 @@ install -p -D -m 0644 \
         rhel/usr_share_ovn_scripts_systemd_sysconfig.template \
         $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/ovn
 
-for service in ovn-controller ovn-controller-vtep ovn-northd ovn-ic; do
+for service in ovn-controller ovn-controller-vtep ovn-northd ovn-ic ovn-ic-db; do
         install -p -D -m 0644 \
                         rhel/usr_lib_systemd_system_${service}.service \
                         $RPM_BUILD_ROOT%{_unitdir}/${service}.service
@@ -280,7 +272,6 @@ fi
     fi
 %endif
 
-%preun ic
 %if 0%{?systemd_preun:1}
     %systemd_preun ovn-ic.service
 %else
@@ -291,6 +282,16 @@ fi
     fi
 %endif
 
+%if 0%{?systemd_preun:1}
+    %systemd_preun ovn-ic-db.service
+%else
+    if [ $1 -eq 0 ] ; then
+        # Package removal, not upgrade
+        /bin/systemctl --no-reload disable ovn-ic-db.service >/dev/null 2>&1 || :
+        /bin/systemctl stop ovn-ic-db.service >/dev/null 2>&1 || :
+    fi
+%endif
+
 %preun host
 %if 0%{?systemd_preun:1}
     %systemd_preun ovn-controller.service
@@ -331,7 +332,6 @@ fi
     fi
 %endif
 
-%post ic
 %if 0%{?systemd_post:1}
     %systemd_post ovn-ic.service
 %else
@@ -341,6 +341,15 @@ fi
     fi
 %endif
 
+%if 0%{?systemd_post:1}
+    %systemd_post ovn-ic-db.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
@@ -374,7 +383,6 @@ fi
     fi
 %endif
 
-%postun ic
 %if 0%{?systemd_postun_with_restart:1}
     %systemd_postun_with_restart ovn-ic.service
 %else
@@ -385,6 +393,12 @@ fi
     fi
 %endif
 
+%if 0%{?systemd_postun:1}
+    %systemd_postun ovn-ic-db.service
+%else
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+%endif
+
 %postun host
 %if 0%{?systemd_postun_with_restart:1}
     %systemd_postun_with_restart ovn-controller.service
@@ -461,6 +475,7 @@ fi
 %{_mandir}/man5/ovn-sb.5*
 %{_mandir}/man8/ovn-ic-nbctl.8*
 %{_mandir}/man8/ovn-ic-sbctl.8*
+%{_mandir}/man8/ovn-ic.8*
 %{_mandir}/man5/ovn-ic-nb.5*
 %{_mandir}/man5/ovn-ic-sb.5*
 %{_prefix}/lib/ocf/resource.d/ovn/ovndb-servers
@@ -472,18 +487,16 @@ fi
 
 %files central
 %{_bindir}/ovn-northd
+%{_bindir}/ovn-ic
 %{_mandir}/man8/ovn-northd.8*
 %config %{_datadir}/ovn/ovn-nb.ovsschema
 %config %{_datadir}/ovn/ovn-sb.ovsschema
-%{_unitdir}/ovn-northd.service
-%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
-
-%files ic
-%{_bindir}/ovn-ic
-%{_mandir}/man8/ovn-ic.8*
 %config %{_datadir}/ovn/ovn-ic-nb.ovsschema
 %config %{_datadir}/ovn/ovn-ic-sb.ovsschema
 %{_unitdir}/ovn-ic.service
+%{_unitdir}/ovn-ic-db.service
+%{_unitdir}/ovn-northd.service
+%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 
 %files host
 %{_bindir}/ovn-controller
@@ -497,8 +510,8 @@ fi
 %{_unitdir}/ovn-controller-vtep.service
 
 %changelog
-* Wed Dec 9 2020 Vladislav Odintsov <odivlad@gmail.com>
-- Added ovn-ic systemd-unit and subpackage.
+* Mon Feb 1 2021 Vladislav Odintsov <odivlad@gmail.com>
+- Added ovn-ic, ovn-ic-db systemd-units.
 
 * Thu Dec 20 2018 Numan Siddique <nusiddiq@redhat.com>
 - OVS/OVN split.

rhel/usr_lib_systemd_system_ovn-ic-db.service

@@ -0,0 +1,32 @@
+# See ovn-ic(8) for details about ovn-ic.
+#
+# To customize the ovn-ic-db service, you may create a configuration file
+# in the /etc/systemd/system/ovn-ic-db.d/ directory.  For example, to specify
+# additional options to be passed to the "ovn-ctl start_ic_ovsdb" command, you
+# could place the following contents in
+# /etc/systemd/system/ovn-ic-db.d/local.conf:
+#
+#   [System]
+#   Environment="OVN_IC_DB_OPTS=--db-ic-nb-create-insecure-remote=yes --db-ic-sb-create-insecure-remote=yes"
+#
+# Alternatively, you may specify environment variables in the file /etc/sysconfig/ovn-ic-db:
+#
+#   OVN_IC_DB_OPTS="--db-ic-nb-create-insecure-remote=yes --db-ic-sb-create-insecure-remote=yes"
+
+[Unit]
+Description=OVN global (IC) northbound and southbound OVSDB servers
+After=syslog.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Environment=OVN_RUNDIR=%t/ovn OVN_DBDIR=/var/lib/ovn
+EnvironmentFile=-/etc/sysconfig/ovn
+EnvironmentFile=-/etc/sysconfig/ovn-ic-db
+ExecStartPre=-/usr/bin/chown -R ${OVN_USER_ID} ${OVN_DBDIR}
+ExecStart=/usr/share/ovn/scripts/ovn-ctl \
+          --ovn-user=${OVN_USER_ID} start_ic_ovsdb $OVN_IC_DB_OPTS
+ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic_ovsdb
+
+[Install]
+WantedBy=multi-user.target

rhel/usr_lib_systemd_system_ovn-ic.service

@@ -23,7 +23,6 @@ RemainAfterExit=yes
 Environment=OVN_RUNDIR=%t/ovn OVN_DBDIR=/var/lib/ovn
 EnvironmentFile=-/etc/sysconfig/ovn
 EnvironmentFile=-/etc/sysconfig/ovn-ic
-ExecStartPre=-/usr/bin/chown -R ${OVN_USER_ID} ${OVN_DBDIR}
 ExecStart=/usr/share/ovn/scripts/ovn-ctl \
           --ovn-user=${OVN_USER_ID} start_ic $OVN_IC_OPTS
 ExecStop=/usr/share/ovn/scripts/ovn-ctl stop_ic