bacula_director -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 8882e8c..a749b31 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -154,8 +154,6 @@ roles:
   postgres_backup_server:
     - backuphost.debian.org
     - storace.debian.org
-  bacula_director:
-    - dinis.debian.org
   bacula_storage:
     - storace.debian.org
   dabackup_client:

diff --git a/hieradata/nodes/dinis.debian.org.yaml b/hieradata/nodes/dinis.debian.org.yaml
new file mode 100644 (file)
index 0000000..0ea1f50
--- /dev/null
+++ b/hieradata/nodes/dinis.debian.org.yaml
@@ -0,0 +1,3 @@
+---
+classes:
+  - bacula::director

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dfe57f0..4eddc24 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -164,12 +164,6 @@ class roles {
                include postgres::backup_source
        }
 
-       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
        }