Skip to content

Commit

Permalink
packaging: remove RHEL conditionals around {pmlogger,pmie_farm} servi…
Browse files Browse the repository at this point in the history
…ce enablement

Remove the <= RHEL8 version conditionals around the enablement of the
pmlogger_farm and pmie_farm services in the %post scriptlet. With this
change, if the pmlogger service ends up enabled (either via upgrade or
by pcp-zeroconf), so does pmlogger_farm. Ditto for pmie / pmie_farm.

In a later release, e.g. PCPv6, we'll revisit this - the primary and
farm services should become independent.
  • Loading branch information
goodwinos committed Nov 10, 2021
1 parent ca47b51 commit fb3f0e0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions build/rpm/pcp.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -2899,7 +2899,6 @@ PCP_SA_DIR=@pcp_sa_dir@
# clean up any stale symlinks for deprecated pm*-poll services
rm -f %{_sysconfdir}/systemd/system/pm*.requires/pm*-poll.* >/dev/null 2>&1 || true

%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
# pmlogger_farm service inherits the same initial state as pmlogger service
if systemctl is-enabled pmlogger.service >/dev/null; then
systemctl enable pmlogger_farm.service pmlogger_farm_check.service
Expand All @@ -2910,7 +2909,6 @@ PCP_SA_DIR=@pcp_sa_dir@
systemctl enable pmie_farm.service pmie_farm_check.service
systemctl start pmie_farm.service pmie_farm_check.service
fi
%endif

%systemd_postun_with_restart pmcd.service
%systemd_post pmcd.service
Expand Down
2 changes: 0 additions & 2 deletions build/rpm/redhat.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3048,7 +3048,6 @@ PCP_LOG_DIR=%{_logsdir}
# clean up any stale symlinks for deprecated pm*-poll services
rm -f %{_sysconfdir}/systemd/system/pm*.requires/pm*-poll.* >/dev/null 2>&1 || true

%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
# pmlogger_farm service inherits the same initial state as pmlogger service
if systemctl is-enabled pmlogger.service >/dev/null; then
systemctl enable pmlogger_farm.service pmlogger_farm_check.service
Expand All @@ -3059,7 +3058,6 @@ PCP_LOG_DIR=%{_logsdir}
systemctl enable pmie_farm.service pmie_farm_check.service
systemctl start pmie_farm.service pmie_farm_check.service
fi
%endif

%systemd_postun_with_restart pmcd.service
%systemd_post pmcd.service
Expand Down

0 comments on commit fb3f0e0

Please sign in to comment.