From: Peter Palfrader Date: Sun, 8 Sep 2019 11:10:05 +0000 (+0200) Subject: retire not-bacula-client local.yaml "role" X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e97755895177e0716d30c2c7e4fcd5cf4f92515a;p=mirror%2Fdsa-puppet.git retire not-bacula-client local.yaml "role" --- diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml index f58c8a442..1f0c52e8c 100644 --- a/modules/debian_org/files/misc/local.yaml +++ b/modules/debian_org/files/misc/local.yaml @@ -128,55 +128,6 @@ host_settings: - tye.debian.org - vento.debian.org - wuiet.debian.org - not-bacula-client: - # buildd - - antheil.debian.org - - arm-arm-01.debian.org - - arm-arm-02.debian.org - - arm-arm-03.debian.org - - arm-arm-04.debian.org - - arm-conova-01.debian.org - - arm-conova-02.debian.org - - arm-conova-03.debian.org - - arm-conova-04.debian.org - - arm-ubc-01.debian.org - - arm-ubc-02.debian.org - - arm-ubc-03.debian.org - - arm-ubc-04.debian.org - - arm-ubc-05.debian.org - - arm-ubc-06.debian.org - - arnold.debian.org - - eberlin.debian.org - - hartmann.debian.org - - hasse.debian.org - - henze.debian.org - - hoiby.debian.org - - mips-aql-01.debian.org - - mips-aql-02.debian.org - - mips-aql-04.debian.org - - mips-aql-05.debian.org - - mips-aql-06.debian.org - - mips-sil-01.debian.org - - mips-manda-01.debian.org - - mipsel-aql-01.debian.org - - mipsel-aql-02.debian.org - - mipsel-aql-03.debian.org - - mipsel-manda-01.debian.org - - mipsel-manda-02.debian.org - - mipsel-manda-03.debian.org - - mipsel-osuosl-01.debian.org - - mipsel-osuosl-02.debian.org - - mipsel-sil-01.debian.org - - ppc64el-osuosl-01.debian.org - - ppc64el-unicamp-01.debian.org - - x86-grnet-01.debian.org - - x86-grnet-02.debian.org - - zandonai.debian.org - - zani.debian.org - - x86-csail-01.debian.org - - x86-csail-02.debian.org - - x86-ubc-01.debian.org - - x86-ubc-02.debian.org mail_port: klecker.debian.org: 2025 new-klecker.debian.org: 2025 diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index b49b6bd9b..ae258efc6 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -7,10 +7,6 @@ # include roles # class roles { - if getfromhash($site::nodeinfo, 'not-bacula-client') { - include bacula::not_a_client - } - if has_role('muninmaster') { include munin::master }