From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 28 Mar 2017 11:43:30 +0000 (+0200)
Subject: make bacula storage and director roles
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=c828a1b822d2987966270de951718a77b2a08511

make bacula storage and director roles
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f84db26e3..515cbb875 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -213,6 +213,10 @@ roles:
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
+  bacula_director:
+    - dinis.debian.org
+  bacula_storage:
+    - storace.debian.org
   dabackup_client:
     - moszumanska.debian.org
     - lw03.debian.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 97e962abe..22cf231e6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -56,22 +56,6 @@ node default {
 		include ganeti2
 	}
 
-	if $::hostname == 'dinis' {
-		include bacula::director
-	} else {
-		package { 'bacula-console':
-			ensure => purged;
-		}
-
-		file { '/etc/bacula/bconsole.conf':
-			ensure => absent;
-		}
-	}
-
-	if $::hostname == 'storace' {
-		include bacula::storage
-	}
-
 	if $::kernel == 'Linux' {
 		include linux
 		include acpi
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7a733e63f..b64450dfe 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -330,4 +330,14 @@ class roles {
 	if has_role('postgresql_server') {
 		include roles::postgresql_server
 	}
+
+	if has_role('bacula_director') {
+		include bacula::director
+	} else {
+		package { 'bacula-console': ensure => purged; }
+		file { '/etc/bacula/bconsole.conf': ensure => absent; }
+	}
+	if has_role('bacula_storage') {
+		include bacula::storage
+	}
 }