bacula_storage -> hiera role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index a749b31..0fc6272 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_storage:
-    - storace.debian.org
   dabackup_client:
     - lw03.debian.org
   debian_mirror:

diff --git a/hieradata/nodes/storace.debian.org.yaml b/hieradata/nodes/storace.debian.org.yaml
index ebfdc3e..2c5eac0 100644 (file)
--- a/hieradata/nodes/storace.debian.org.yaml
+++ b/hieradata/nodes/storace.debian.org.yaml
@@ -1,2 +1,4 @@
+---
 classes:
-        - profile::ipsec::fasolo_storace
+  - bacula::storage
+  - profile::ipsec::fasolo_storace

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4eddc24..d401bf0 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -164,10 +164,6 @@ class roles {
                include postgres::backup_source
        }
 
-       if has_role('bacula_storage') {
-               include bacula::storage
-       }
-
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }