From cf5b88f352b85590fa6c1a3ea8d4285f27f29838 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 7 Sep 2019 20:00:48 +0200
Subject: [PATCH] Move broken-rtc from a localinfo "role" defined in local.yaml
 to a class included via hiera

---
 hieradata/nodes/abel.debian.org.yaml          |  2 ++
 hieradata/nodes/antheil.debian.org.yaml       |  2 ++
 hieradata/nodes/arm-arm-03.debian.org.yaml    |  2 ++
 hieradata/nodes/arnold.debian.org.yaml        |  2 ++
 hieradata/nodes/eller.debian.org.yaml         |  2 ++
 hieradata/nodes/harris.debian.org.yaml        |  2 ++
 hieradata/nodes/hasse.debian.org.yaml         |  2 ++
 hieradata/nodes/henze.debian.org.yaml         |  2 ++
 hieradata/nodes/hoiby.debian.org.yaml         |  2 ++
 hieradata/nodes/mips-aql-01.debian.org.yaml   |  2 ++
 hieradata/nodes/mips-aql-02.debian.org.yaml   |  2 ++
 hieradata/nodes/mips-aql-04.debian.org.yaml   |  2 ++
 hieradata/nodes/mips-aql-05.debian.org.yaml   |  2 ++
 hieradata/nodes/mips-aql-06.debian.org.yaml   |  2 ++
 hieradata/nodes/mips-manda-01.debian.org.yaml |  2 ++
 hieradata/nodes/mips-sil-01.debian.org.yaml   |  2 ++
 hieradata/nodes/mipsel-aql-03.debian.org.yaml |  2 ++
 .../nodes/mipsel-manda-03.debian.org.yaml     |  2 ++
 .../nodes/mipsel-osuosl-01.debian.org.yaml    |  2 ++
 .../nodes/mipsel-osuosl-02.debian.org.yaml    |  2 ++
 hieradata/nodes/mipsel-sil-01.debian.org.yaml |  2 ++
 modules/debian_org/files/misc/local.yaml      | 22 ---------------
 modules/debian_org/manifests/init.pp          |  7 -----
 modules/ntpdate/manifests/init.pp             | 27 +++++++++----------
 modules/roles/manifests/broken_rtc.pp         | 10 +++++++
 modules/time/manifests/init.pp                |  1 -
 26 files changed, 64 insertions(+), 45 deletions(-)
 create mode 100644 hieradata/nodes/abel.debian.org.yaml
 create mode 100644 hieradata/nodes/antheil.debian.org.yaml
 create mode 100644 hieradata/nodes/arm-arm-03.debian.org.yaml
 create mode 100644 hieradata/nodes/arnold.debian.org.yaml
 create mode 100644 hieradata/nodes/eller.debian.org.yaml
 create mode 100644 hieradata/nodes/harris.debian.org.yaml
 create mode 100644 hieradata/nodes/hasse.debian.org.yaml
 create mode 100644 hieradata/nodes/henze.debian.org.yaml
 create mode 100644 hieradata/nodes/hoiby.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-aql-01.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-aql-02.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-aql-04.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-aql-05.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-aql-06.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-manda-01.debian.org.yaml
 create mode 100644 hieradata/nodes/mips-sil-01.debian.org.yaml
 create mode 100644 hieradata/nodes/mipsel-aql-03.debian.org.yaml
 create mode 100644 hieradata/nodes/mipsel-manda-03.debian.org.yaml
 create mode 100644 hieradata/nodes/mipsel-osuosl-01.debian.org.yaml
 create mode 100644 hieradata/nodes/mipsel-osuosl-02.debian.org.yaml
 create mode 100644 hieradata/nodes/mipsel-sil-01.debian.org.yaml
 create mode 100644 modules/roles/manifests/broken_rtc.pp

diff --git a/hieradata/nodes/abel.debian.org.yaml b/hieradata/nodes/abel.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/abel.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/antheil.debian.org.yaml b/hieradata/nodes/antheil.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/antheil.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/arm-arm-03.debian.org.yaml b/hieradata/nodes/arm-arm-03.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/arm-arm-03.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/arnold.debian.org.yaml b/hieradata/nodes/arnold.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/arnold.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/eller.debian.org.yaml b/hieradata/nodes/eller.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/eller.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/harris.debian.org.yaml b/hieradata/nodes/harris.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/harris.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/hasse.debian.org.yaml b/hieradata/nodes/hasse.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/hasse.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/henze.debian.org.yaml b/hieradata/nodes/henze.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/henze.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/hoiby.debian.org.yaml b/hieradata/nodes/hoiby.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/hoiby.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-aql-01.debian.org.yaml b/hieradata/nodes/mips-aql-01.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-aql-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-aql-02.debian.org.yaml b/hieradata/nodes/mips-aql-02.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-aql-02.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-aql-04.debian.org.yaml b/hieradata/nodes/mips-aql-04.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-aql-04.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-aql-05.debian.org.yaml b/hieradata/nodes/mips-aql-05.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-aql-05.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-aql-06.debian.org.yaml b/hieradata/nodes/mips-aql-06.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-aql-06.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-manda-01.debian.org.yaml b/hieradata/nodes/mips-manda-01.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-manda-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mips-sil-01.debian.org.yaml b/hieradata/nodes/mips-sil-01.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mips-sil-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mipsel-aql-03.debian.org.yaml b/hieradata/nodes/mipsel-aql-03.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mipsel-aql-03.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mipsel-manda-03.debian.org.yaml b/hieradata/nodes/mipsel-manda-03.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mipsel-manda-03.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml b/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml b/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/hieradata/nodes/mipsel-sil-01.debian.org.yaml b/hieradata/nodes/mipsel-sil-01.debian.org.yaml
new file mode 100644
index 000000000..14ec4d25f
--- /dev/null
+++ b/hieradata/nodes/mipsel-sil-01.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::broken_rtc
diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index a78bd63f5..11645fbca 100644
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -186,28 +186,6 @@ host_settings:
     - x86-csail-02.debian.org
     - x86-ubc-01.debian.org
     - x86-ubc-02.debian.org
-  broken-rtc:
-    - abel.debian.org
-    - antheil.debian.org
-    - arm-arm-03.debian.org
-    - arnold.debian.org
-    - eller.debian.org
-    - harris.debian.org
-    - hasse.debian.org
-    - henze.debian.org
-    - hoiby.debian.org
-    - mips-aql-01.debian.org
-    - mips-aql-02.debian.org
-    - mips-aql-04.debian.org
-    - mips-aql-05.debian.org
-    - mips-aql-06.debian.org
-    - mips-manda-01.debian.org
-    - mips-sil-01.debian.org
-    - mipsel-aql-03.debian.org
-    - mipsel-manda-03.debian.org
-    - mipsel-osuosl-01.debian.org
-    - mipsel-osuosl-02.debian.org
-    - mipsel-sil-01.debian.org
   mail_port:
     klecker.debian.org: 2025
     new-klecker.debian.org: 2025
diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 63a92fd2e..0c4c493e4 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -76,13 +76,6 @@ class debian_org {
 		]:
 	}
 
-	if getfromhash($site::nodeinfo, 'broken-rtc') {
-		package { 'fake-hwclock':
-			ensure => installed,
-			tag    => extra_repo,
-		}
-	}
-
 	package { 'molly-guard':
 		ensure => installed,
 	}
diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index f7a7de632..c4d7c8b8a 100644
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -1,19 +1,16 @@
 class ntpdate {
+  package { [
+    'ntpdate',
+    'lockfile-progs'
+  ]:
+    ensure => installed
+  }
 
-	if getfromhash($site::nodeinfo, 'broken-rtc') {
-		package { [
-			'ntpdate',
-			'lockfile-progs'
-		]:
-			ensure => installed
-		}
+  $ntpservers = $::hostname ? {
+    default => ['manda-node03.debian.org', 'manda-node04.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org']
+  }
 
-		$ntpservers = $::hostname ? {
-			default => ['manda-node03.debian.org', 'manda-node04.debian.org', 'bm-bl1.debian.org', 'bm-bl2.debian.org']
-		}
-
-		file { '/etc/default/ntpdate':
-			content => template('ntpdate/etc-default-ntpdate.erb'),
-		}
-	}
+  file { '/etc/default/ntpdate':
+    content => template('ntpdate/etc-default-ntpdate.erb'),
+  }
 }
diff --git a/modules/roles/manifests/broken_rtc.pp b/modules/roles/manifests/broken_rtc.pp
new file mode 100644
index 000000000..4a55c371d
--- /dev/null
+++ b/modules/roles/manifests/broken_rtc.pp
@@ -0,0 +1,10 @@
+# Hosts with a broken or no RTC (real time clock)
+class roles::broken_rtc {
+  ensure_packages ( [
+    'fake-hwclock',
+  ], {
+    ensure => 'installed',
+  })
+
+  include ntpdate
+}
diff --git a/modules/time/manifests/init.pp b/modules/time/manifests/init.pp
index 9f1ec6032..13010f2a0 100644
--- a/modules/time/manifests/init.pp
+++ b/modules/time/manifests/init.pp
@@ -9,6 +9,5 @@ class time {
 		include systemdtimesyncd
 	} else {
 		include ntp
-		include ntpdate
 	}
 }
-- 
2.20.1