From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 17:39:20 +0000 (+0200)
Subject: nagiosmaster -> hiera role; bind acls still not converted
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=f77499d4ba53abb8e56b1923d25fb1b828e46328

nagiosmaster -> hiera role; bind acls still not converted
---

diff --git a/data/common.yaml b/data/common.yaml
index 24140e113..e2bb53b60 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -55,7 +55,7 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/'
 # with the host. weasel, 2019-09
 roles:
   nagiosmaster:
-    # XXX - used by ferm templates/defs.conf.erb
+    # XXX - only used by bind ACLs
     - tchaikovsky.debian.org
   security_mirror:
     # XXX used also in ferm me.conf.erb
diff --git a/data/nodes/tchaikovsky.debian.org.yaml b/data/nodes/tchaikovsky.debian.org.yaml
index d98e3f280..63a94da0e 100644
--- a/data/nodes/tchaikovsky.debian.org.yaml
+++ b/data/nodes/tchaikovsky.debian.org.yaml
@@ -1,2 +1,5 @@
 ---
+classes:
+  - nagios::server
+
 apache2::mpm: prefork
diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 2771f61f1..2e3f23d6d 100644
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -24,7 +24,7 @@
   allnodeinfo = scope.lookupvar('deprecated::allnodeinfo')
   roles = scope.lookupvar('deprecated::roles')
 
-  %w{nagiosmaster postgres_backup_server}.each do |role|
+  %w{postgres_backup_server}.each do |role|
     rolehost[role] = []
     roles[role].each do |node|
         next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber')
@@ -41,10 +41,6 @@
   dbs.flatten!
 %>
 
-@def $HOST_NAGIOS_V4 = (<%= scope.function_filter_ipv4([rolehost['nagiosmaster']]).uniq.join(' ') %>);
-@def $HOST_NAGIOS_V6 = (<%= scope.function_filter_ipv6([rolehost['nagiosmaster']]).uniq.join(' ') %>);
-@def $HOST_NAGIOS = ( $HOST_NAGIOS_V4 $HOST_NAGIOS_V6 );
-
 @def $HOST_PGBACKUPHOST_V4 = (<%= scope.function_filter_ipv4([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
 @def $HOST_PGBACKUPHOST_V6 = (<%= scope.function_filter_ipv6([rolehost['postgres_backup_server']]).uniq.join(' ') %>);
 @def $HOST_PGBACKUPHOST = ( $HOST_PGBACKUPHOST_V4 $HOST_PGBACKUPHOST_V6 );
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6accbf741..fb571c56f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,10 +7,6 @@
 #   include roles
 #
 class roles {
-	if has_role('nagiosmaster') {
-		include nagios::server
-	}
-
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 68ed9a3dc..0bbd965c6 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -157,7 +157,7 @@ file=/etc/nagios
 file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
-<% if scope.function_has_role(['nagiosmaster']) -%>
+<% if classes.include?("nagios::server") -%>
 file=/etc/nagios3/puppetconf.d
 <% end -%>
 file=/etc/puppet
@@ -426,7 +426,7 @@ file=/etc/schroot/setup.d/99porterbox-extra-sources
 file=/etc/schroot/setup.d/99porterbox-extra-apt-options
 file=/etc/openvswitch/conf.db
 
-<% if scope.function_has_role(['nagiosmaster']) -%>
+<% if classes.include?("nagios::server") -%>
 file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 file=/etc/nagios3/puppetconf.d/auto-services.cfg