From 93bbb3585dc5f0ec8a28d616001d19065f28a41f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 16:55:37 +0200 Subject: [PATCH] bacula_storage -> hiera role --- hieradata/common.yaml | 2 -- hieradata/nodes/storace.debian.org.yaml | 4 +++- modules/roles/manifests/init.pp | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index a749b3134..0fc62720f 100644 --- 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 ebfdc3e15..2c5eac0a3 100644 --- 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 4eddc241c..d401bf098 100644 --- 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 } -- 2.20.1