From 9480a9a511559609c29299430b11b34e2a7f231a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 20 Sep 2019 20:52:47 +0200 Subject: [PATCH] Retire unused extranrpeclient role -- the mini-nag host now pushes a storedconf to get nrpe access --- hieradata/common.yaml | 3 --- modules/ferm/templates/defs.conf.erb | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index d34000284..31042be25 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -52,9 +52,6 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/' # all of these should be retired in favour of including the class role # with the host. weasel, 2019-09 roles: - extranrpeclient: - # XXX - used by ferm templates/defs.conf.erb - - denis.debian.org ftp_master: # XXX - used by ferm templates/defs.conf.erb - fasolo.debian.org diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index df91f7e68..365fdc8a4 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{mailrelay nagiosmaster extranrpeclient muninmaster postgres_backup_server syncproxy security_master ftp_master historical_master ports_master mirrormaster}.each do |role| + %w{mailrelay nagiosmaster muninmaster postgres_backup_server syncproxy security_master ftp_master historical_master ports_master mirrormaster}.each do |role| rolehost[role] = [] roles[role].each do |node| next unless allnodeinfo.has_key?(node) and allnodeinfo[node].has_key?('ipHostNumber') @@ -45,8 +45,8 @@ @def $HOST_MAILRELAY_V6 = (<%= scope.function_filter_ipv6([rolehost['mailrelay']]).uniq.join(' ') %>); @def $HOST_MAILRELAY = ( $HOST_MAILRELAY_V4 $HOST_MAILRELAY_V6 ); -@def $HOST_NAGIOS_V4 = (<%= scope.function_filter_ipv4([rolehost['nagiosmaster'] + rolehost['extranrpeclient']]).uniq.join(' ') %>); -@def $HOST_NAGIOS_V6 = (<%= scope.function_filter_ipv6([rolehost['nagiosmaster'] + rolehost['extranrpeclient']]).uniq.join(' ') %>); +@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_MUNIN_V4 = (<%= scope.function_filter_ipv4([rolehost['muninmaster']]).uniq.join(' ') %>); -- 2.20.1