From: Tollef Fog Heen <tfheen@err.no>
Date: Tue, 21 May 2013 20:42:48 +0000 (+0200)
Subject: Move list of bacula clients to local.yaml
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=27c4a4ad346d4eccbb6e39e599e11d8e1b07682b

Move list of bacula clients to local.yaml
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index b1aa64a0..4db324d0 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,7 +1,7 @@
 class bacula::client inherits bacula {
 	@@bacula::storage-per-node { $::fqdn: }
 
-	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, elgar, geo3, jenkins, kaufmann, lilburn, lully, master, picconi, pejacevic, piu-slave-bm-a, popov, reger, schumann, soler, vento, vieuxtemps, wilder, wolkenstein] {
+	if getfromhash($site::nodeinfo, 'bacula-client') {
 		@@bacula::node { $::fqdn: }
 	}
 
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 0a733399..f8a8edbe 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -255,6 +255,31 @@ host_settings:
     - merikanto.debian.org
     - orff.debian.org
     - ravel.debian.org
+  bacula-client:
+    - beethoven.debian.org
+    - berlioz.debian.org
+    - biber.debian.org
+    - diabelli.debian.org
+    - dinis.debian.org
+    - draghi.debian.org
+    - elgar.debian.org
+    - geo3.debian.org
+    - jenkins.debian.org
+    - kaufmann.debian.org
+    - lilburn.debian.org
+    - lully.debian.org
+    - master.debian.org
+    - picconi.debian.org
+    - pejacevic.debian.org
+    - piu-slave-bm-a.debian.org
+    - popov.debian.org
+    - reger.debian.org
+    - schumann.debian.org
+    - soler.debian.org
+    - vento.debian.org
+    - vieuxtemps.debian.org
+    - wilder.debian.org
+    - wolkenstein.debian.org
   broken-rtc:
     - abel.debian.org
     - alain.debian.org