make bacula storage and director roles

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f84db26..515cbb8 100644 (file)
--- 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 97e962a..22cf231 100644 (file)
--- 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 7a733e6..b64450d 100644 (file)
--- 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
+       }
 }