From ac907b5403495836b100ec3ebcdb11ee9d64b1e3 Mon Sep 17 00:00:00 2001
From: mergwyn <gary@theclarkhome.com>
Date: Sun, 6 Oct 2024 09:49:45 +0100
Subject: [PATCH] Move ntpsec workaround to hiera

---
 data/os/Ubuntu/24.04.yaml                      | 18 ++++++++++++++++++
 .../manifests/platform/baseline/debian/ntp.pp  |  2 --
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 data/os/Ubuntu/24.04.yaml

diff --git a/data/os/Ubuntu/24.04.yaml b/data/os/Ubuntu/24.04.yaml
new file mode 100644
index 00000000..905cdf1a
--- /dev/null
+++ b/data/os/Ubuntu/24.04.yaml
@@ -0,0 +1,18 @@
+---
+
+# TODO until formal support for 22.04 in puppet-php
+#php::globals::php_version: '8.1'
+
+# TODO workaround until puppet erver/db ackages released for jammy
+#profile::puppet::repo::release: 'focal'
+
+# TODO workaround until puppetboard support released for jammy
+#puppetboard::python_version: '3.10'
+
+
+# TODO Workaound for https://github.com/puppetlabs/puppetlabs-ntp/pull/700
+# default ntp is a transitional package install ntpsec
+ntp::package_name: [ntpsec]
+ntp::driftfile: /var/lib/ntpsec/ntp.drift
+ntp::config: /etc/ntpsec/ntp.conf
+ntp::daemon_config: /etc/default/ntpsec
diff --git a/site-modules/profile/manifests/platform/baseline/debian/ntp.pp b/site-modules/profile/manifests/platform/baseline/debian/ntp.pp
index 826764da..d100a8b6 100644
--- a/site-modules/profile/manifests/platform/baseline/debian/ntp.pp
+++ b/site-modules/profile/manifests/platform/baseline/debian/ntp.pp
@@ -26,8 +26,6 @@
       servers           => [ $local_clock ] + $network_servers,
       restrict          => $restrict_default + $restrict,
       fudge             => [ "${local_clock} stratum 10" ],
-# TODO remove workaround for https://github.com/puppetlabs/puppetlabs-ntp/pull/700
-      driftfile         => '/var/lib/ntpsec/drift', # ubuntu 24.04
     }
   }
 }