Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/315243
Change subject: naggen2: Kill hostextinfo support ...................................................................... naggen2: Kill hostextinfo support Nagios has deprecated hostextinfo for some time and newer icinga versions loudly complain when it is used. Remove support for it from naggen2 Change-Id: Iae42ecda3a10d9aebf5a1a55467a01e1c105fb41 --- M modules/puppetmaster/files/naggen2 1 file changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/43/315243/1 diff --git a/modules/puppetmaster/files/naggen2 b/modules/puppetmaster/files/naggen2 index 7c0d3a1..e97523e 100755 --- a/modules/puppetmaster/files/naggen2 +++ b/modules/puppetmaster/files/naggen2 @@ -21,7 +21,6 @@ restype = { 'services': 'Nagios_service', 'hosts': 'Nagios_host', - 'hostextinfo': 'Nagios_hostextinfo' } restpl = { @@ -35,12 +34,6 @@ } """, 'hosts': """define host { -{% for line in data -%} -{{ "\t%-30s %s" % line }} -{% endfor %} -} -""", - 'hostextinfo': """define hostextinfo { {% for line in data -%} {{ "\t%-30s %s" % line }} {% endfor %} @@ -149,7 +142,7 @@ def _filter_entity(self, entity, what): name = entity['title'] # PuppetDB 2.3 does not collect the host_name parameter, apparently - if what in ['hosts', 'hostextinfo']: + if what in ['hosts']: if 'host_name' not in entity['parameters']: entity['parameters']['host_name'] = entity['title'] @@ -164,7 +157,7 @@ parser.add_argument('--type', '-t', dest='type', help="type of file to generate", - choices=['services', 'hosts', 'hostextinfo']) + choices=['services', 'hosts']) parser.add_argument( '--configfile', '-c', dest='configfile', default='/etc/puppet/puppet.conf') parser.add_argument('--debug', action='store_true', default=False) -- To view, visit https://gerrit.wikimedia.org/r/315243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae42ecda3a10d9aebf5a1a55467a01e1c105fb41 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits