DLPX-93479 ntpsec-rotate-stats.timer should follow ntpsec.service (#795)

PR URL: https://www.github.com/delphix/appliance-build/pull/795

live-build/misc/ansible-roles/appliance-build.virtualization-common/tasks/main.yml

@@ -81,6 +81,7 @@
     - delphix-fluentd.service
     - delphix-masking.service
     - ntpsec.service
+    - ntpsec-rotate-stats.timer
     - snmpd.service
 
 #

upgrade/upgrade-scripts/common.sh

@@ -492,6 +492,7 @@ function fix_and_migrate_services() {
 		nfs-mountd.service
 		nginx.service
 		ntpsec.service
+		ntpsec-rotate-stats.timer
 		postgresql.service
 		rpc-statd.service
 		rpcbind.service

upgrade/upgrade-scripts/execute

@@ -387,6 +387,7 @@ if [[ -f "/etc/ntp/ntp.conf" ]]; then
 	cp /etc/ntp/ntp.conf /etc/ntpsec/ntp.conf ||
 		die "failed to copy /etc/ntp/ntp.conf to /etc/ntpsec/ntp.conf"
 	if [[ "$(systemctl is-enabled ntp.service)" == enabled ]]; then
+		systemctl disable --now ntp.service
 		systemctl enable ntpsec.service
 	fi
 fi
@@ -494,6 +495,15 @@ if [[ "$(systemctl is-enabled telegraf)" == enabled ]]; then
 	systemctl mask --now telegraf.service
 fi
 
+#
+# Upgrading to LTS 24.04 causes the `ntpsec` package to be installed. This package installs the
+# `ntpsec-rotate-stats.timer` timer which is enabled by default. Our product never enables
+# the collection of NTP stats, so we disable the timer to prevent it from running.
+#
+if [[ "$(systemctl is-enabled ntpsec-rotate-stats.timer)" == enabled ]]; then
+	systemctl mask --now ntpsec-rotate-stats.timer
+fi
+
 #
 # Unmask docker, which was masked at the beginning of the upgrade due
 # to DLPX-77949.