Move broken-rtc from a localinfo "role" defined in local.yaml to a class included...

diff --git a/hieradata/nodes/abel.debian.org.yaml b/hieradata/nodes/abel.debian.org.yaml
new file mode 100644 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 (file)
index 0000000..14ec4d2
--- /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 a78bd63..11645fb 100644 (file)
--- 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 63a92fd..0c4c493 100644 (file)
--- 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 f7a7de6..c4d7c8b 100644 (file)
--- 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 (file)
index 0000000..4a55c37
--- /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 9f1ec60..13010f2 100644 (file)
--- 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
        }
 }