Revert "rhel: Add systemd-unit for ovn-ic and move IC to sub-rpm ovn-…

…ic."

This reverts commit 8abe98f.

Submitted-at: ovn-org#65
Signed-off-by: Vladislav Odintsov <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>

rhel/automake.mk

@@ -13,7 +13,6 @@ EXTRA_DIST += \
 	rhel/ovn-fedora.spec.in \
 	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-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; do
         install -p -D -m 0644 \
                         rhel/usr_lib_systemd_system_${service}.service \
                         $RPM_BUILD_ROOT%{_unitdir}/${service}.service
@@ -264,7 +256,7 @@ if [ $1 -eq 1 ] ; then
     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 vtep is called.
+        # start ovn-controller-vtep service when posttrans host is called.
         touch %{_localstatedir}/lib/rpm-state/ovn-controller-vtep
     fi
 fi
@@ -280,17 +272,6 @@ fi
     fi
 %endif
 
-%preun ic
-%if 0%{?systemd_preun:1}
-    %systemd_preun ovn-ic.service
-%else
-    if [ $1 -eq 0 ] ; then
-        # Package removal, not upgrade
-        /bin/systemctl --no-reload disable ovn-ic.service >/dev/null 2>&1 || :
-        /bin/systemctl stop ovn-ic.service >/dev/null 2>&1 || :
-    fi
-%endif
-
 %preun host
 %if 0%{?systemd_preun:1}
     %systemd_preun ovn-controller.service
@@ -331,16 +312,6 @@ fi
     fi
 %endif
 
-%post ic
-%if 0%{?systemd_post:1}
-    %systemd_post ovn-ic.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,17 +345,6 @@ fi
     fi
 %endif
 
-%postun ic
-%if 0%{?systemd_postun_with_restart:1}
-    %systemd_postun_with_restart ovn-ic.service
-%else
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-    if [ "$1" -ge "1" ] ; then
-    # Package upgrade, not uninstall
-        /bin/systemctl try-restart ovn-ic.service >/dev/null 2>&1 || :
-    fi
-%endif
-
 %postun host
 %if 0%{?systemd_postun_with_restart:1}
     %systemd_postun_with_restart ovn-controller.service
@@ -461,6 +421,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 +433,14 @@ 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-northd.service
+%{_prefix}/lib/firewalld/services/ovn-central-firewall-service.xml
 
 %files host
 %{_bindir}/ovn-controller
@@ -497,8 +454,5 @@ fi
 %{_unitdir}/ovn-controller-vtep.service
 
 %changelog
-* Wed Dec 9 2020 Vladislav Odintsov <[email protected]>
-- Added ovn-ic systemd-unit and subpackage.
-
 * Thu Dec 20 2018 Numan Siddique <[email protected]>
 - OVS/OVN split.