From 781660b47e5de79eb42aa8c6a9f42e3a763e21f2 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 09:28:23 +0200 Subject: [PATCH] lists -> hiera role --- hieradata/common.yaml | 2 -- hieradata/nodes/bendel.debian.org.yaml | 5 ++++- modules/roles/manifests/init.pp | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index d492a7871..8dec0bc0c 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -69,8 +69,6 @@ roles: - adayevskaya.debian.org historicalpackages: - hier.debian.org - lists: - - bendel.debian.org mailrelay: - mailly.debian.org - muffat.debian.org diff --git a/hieradata/nodes/bendel.debian.org.yaml b/hieradata/nodes/bendel.debian.org.yaml index 68fcfea53..079643587 100644 --- a/hieradata/nodes/bendel.debian.org.yaml +++ b/hieradata/nodes/bendel.debian.org.yaml @@ -1,2 +1,5 @@ ---- +--- +classes: + - roles::lists + postfix::manage_maincf: false diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 57ada6b7f..69bd62509 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -132,10 +132,6 @@ class roles { include roles::security_tracker } - if has_role('lists') { - include roles::lists - } - if has_role('rtmaster') { include roles::rtmaster } -- 2.20.1