From: Peter Palfrader Date: Sun, 8 Sep 2019 11:08:01 +0000 (+0200) Subject: turn buildd into a real role X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d3e812cb9c2b22b06511876a1520cddc2da12db1;p=mirror%2Fdsa-puppet.git turn buildd into a real role --- diff --git a/hieradata/nodes/antheil.debian.org.yaml b/hieradata/nodes/antheil.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/antheil.debian.org.yaml +++ b/hieradata/nodes/antheil.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/arm-arm-01.debian.org.yaml b/hieradata/nodes/arm-arm-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-arm-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-arm-03.debian.org.yaml b/hieradata/nodes/arm-arm-03.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/arm-arm-03.debian.org.yaml +++ b/hieradata/nodes/arm-arm-03.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/arm-arm-04.debian.org.yaml b/hieradata/nodes/arm-arm-04.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-arm-04.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-conova-01.debian.org.yaml b/hieradata/nodes/arm-conova-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-conova-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-conova-02.debian.org.yaml b/hieradata/nodes/arm-conova-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-conova-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-01.debian.org.yaml b/hieradata/nodes/arm-ubc-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-02.debian.org.yaml b/hieradata/nodes/arm-ubc-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-03.debian.org.yaml b/hieradata/nodes/arm-ubc-03.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-03.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-04.debian.org.yaml b/hieradata/nodes/arm-ubc-04.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-04.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-05.debian.org.yaml b/hieradata/nodes/arm-ubc-05.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-05.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arm-ubc-06.debian.org.yaml b/hieradata/nodes/arm-ubc-06.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/arm-ubc-06.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/arnold.debian.org.yaml b/hieradata/nodes/arnold.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/arnold.debian.org.yaml +++ b/hieradata/nodes/arnold.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/eberlin.debian.org.yaml b/hieradata/nodes/eberlin.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/eberlin.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/hartmann.debian.org.yaml b/hieradata/nodes/hartmann.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/hartmann.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/hasse.debian.org.yaml b/hieradata/nodes/hasse.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/hasse.debian.org.yaml +++ b/hieradata/nodes/hasse.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/henze.debian.org.yaml b/hieradata/nodes/henze.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/henze.debian.org.yaml +++ b/hieradata/nodes/henze.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/hoiby.debian.org.yaml b/hieradata/nodes/hoiby.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/hoiby.debian.org.yaml +++ b/hieradata/nodes/hoiby.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-aql-01.debian.org.yaml b/hieradata/nodes/mips-aql-01.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-aql-01.debian.org.yaml +++ b/hieradata/nodes/mips-aql-01.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-aql-02.debian.org.yaml b/hieradata/nodes/mips-aql-02.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-aql-02.debian.org.yaml +++ b/hieradata/nodes/mips-aql-02.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-aql-04.debian.org.yaml b/hieradata/nodes/mips-aql-04.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-aql-04.debian.org.yaml +++ b/hieradata/nodes/mips-aql-04.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-aql-05.debian.org.yaml b/hieradata/nodes/mips-aql-05.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-aql-05.debian.org.yaml +++ b/hieradata/nodes/mips-aql-05.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-aql-06.debian.org.yaml b/hieradata/nodes/mips-aql-06.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-aql-06.debian.org.yaml +++ b/hieradata/nodes/mips-aql-06.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-manda-01.debian.org.yaml b/hieradata/nodes/mips-manda-01.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-manda-01.debian.org.yaml +++ b/hieradata/nodes/mips-manda-01.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mips-sil-01.debian.org.yaml b/hieradata/nodes/mips-sil-01.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mips-sil-01.debian.org.yaml +++ b/hieradata/nodes/mips-sil-01.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mipsel-aql-01.debian.org.yaml b/hieradata/nodes/mipsel-aql-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/mipsel-aql-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/mipsel-aql-02.debian.org.yaml b/hieradata/nodes/mipsel-aql-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/mipsel-aql-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/mipsel-aql-03.debian.org.yaml b/hieradata/nodes/mipsel-aql-03.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mipsel-aql-03.debian.org.yaml +++ b/hieradata/nodes/mipsel-aql-03.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mipsel-manda-01.debian.org.yaml b/hieradata/nodes/mipsel-manda-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/mipsel-manda-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/mipsel-manda-02.debian.org.yaml b/hieradata/nodes/mipsel-manda-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/mipsel-manda-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/mipsel-manda-03.debian.org.yaml b/hieradata/nodes/mipsel-manda-03.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mipsel-manda-03.debian.org.yaml +++ b/hieradata/nodes/mipsel-manda-03.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml b/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml +++ b/hieradata/nodes/mipsel-osuosl-01.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml b/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml +++ b/hieradata/nodes/mipsel-osuosl-02.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/mipsel-sil-01.debian.org.yaml b/hieradata/nodes/mipsel-sil-01.debian.org.yaml index 14ec4d25f..7a59c412c 100644 --- a/hieradata/nodes/mipsel-sil-01.debian.org.yaml +++ b/hieradata/nodes/mipsel-sil-01.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::broken_rtc + - roles::buildd diff --git a/hieradata/nodes/ppc64el-osuosl-01.debian.org.yaml b/hieradata/nodes/ppc64el-osuosl-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/ppc64el-osuosl-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/ppc64el-unicamp-01.debian.org.yaml b/hieradata/nodes/ppc64el-unicamp-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/ppc64el-unicamp-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-csail-01.debian.org.yaml b/hieradata/nodes/x86-csail-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-csail-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-csail-02.debian.org.yaml b/hieradata/nodes/x86-csail-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-csail-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-grnet-01.debian.org.yaml b/hieradata/nodes/x86-grnet-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-grnet-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-grnet-02.debian.org.yaml b/hieradata/nodes/x86-grnet-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-grnet-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-ubc-01.debian.org.yaml b/hieradata/nodes/x86-ubc-01.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-ubc-01.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/x86-ubc-02.debian.org.yaml b/hieradata/nodes/x86-ubc-02.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/x86-ubc-02.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/zandonai.debian.org.yaml b/hieradata/nodes/zandonai.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/zandonai.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/hieradata/nodes/zani.debian.org.yaml b/hieradata/nodes/zani.debian.org.yaml new file mode 100644 index 000000000..a823a0af4 --- /dev/null +++ b/hieradata/nodes/zani.debian.org.yaml @@ -0,0 +1,2 @@ +classes: + - roles::buildd diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index 4fb8971a5..7e6446e05 100644 --- a/modules/motd/templates/motd.erb +++ b/modules/motd/templates/motd.erb @@ -47,8 +47,9 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone() entries = "" - if p.delete('buildd') + if classes.include?("roles::buildd") entries += ", the Debian #{arch} build daemon" + p.delete('buildd') end if classes.include?("roles::porterbox") entries += ", the Debian #{arch} porterbox" diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index c7af8ae6f..31ba38581 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -11,7 +11,6 @@ module Puppet::Parser::Functions raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap" end nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber']]) - nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd')) nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver')) nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host')) diff --git a/modules/roles/manifests/buildd.pp b/modules/roles/manifests/buildd.pp new file mode 100644 index 000000000..4754d638c --- /dev/null +++ b/modules/roles/manifests/buildd.pp @@ -0,0 +1,5 @@ +# debian.org buildd +class roles::buildd { + include buildd + include bacula::not_a_client +} diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 87cf8e265..b49b6bd9b 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -19,11 +19,6 @@ class roles { include nagios::server } - # XXX: turn this into a real role - if getfromhash($site::nodeinfo, 'buildd') { - include buildd - } - if has_role('bugs_mirror') { include roles::bugs_mirror } diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 0faf5ec67..e72f5d4a4 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -266,7 +266,7 @@ dir=-1/srv ## This file might be created or removed by the system sometimes. ## file=/etc/resolv.conf -<% if scope.lookupvar('site::nodeinfo')['buildd'] -%> +<% if classes.include?('roles::buildd') -%> file=/etc/dupload.conf file=/etc/buildd/buildd.conf file=/etc/sbuild/sbuild.conf