From 2226a9eae92cbab595f28a885f139b9b5781327c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 23 Feb 2016 02:33:30 +0000 Subject: [PATCH] s/nagios_client/nagios\/client/g --- playbooks/groups/anitya.yml | 2 +- playbooks/groups/ask.yml | 2 +- playbooks/groups/autocloud-backend.yml | 2 +- playbooks/groups/autocloud-web.yml | 2 +- playbooks/groups/autosign.yml | 2 +- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/badges-backend.yml | 2 +- playbooks/groups/badges-web.yml | 2 +- playbooks/groups/bastion.yml | 2 +- playbooks/groups/batcave.yml | 2 +- playbooks/groups/beaker-stg.yml | 2 +- playbooks/groups/beaker-virthosts.yml | 2 +- playbooks/groups/beaker.yml | 2 +- playbooks/groups/blockerbugs.yml | 2 +- playbooks/groups/bodhi-backend.yml | 2 +- playbooks/groups/bodhi2.yml | 2 +- playbooks/groups/bugyou.yml | 2 +- playbooks/groups/bugzilla2fedmsg.yml | 2 +- playbooks/groups/busgateway.yml | 2 +- playbooks/groups/composers.yml | 2 +- playbooks/groups/darkserver-backend.yml | 2 +- playbooks/groups/darkserver-web.yml | 2 +- playbooks/groups/darkserver.yml | 2 +- playbooks/groups/datagrepper.yml | 2 +- playbooks/groups/dhcp.yml | 2 +- playbooks/groups/dns.yml | 2 +- playbooks/groups/docs-backend.yml | 2 +- playbooks/groups/download.yml | 2 +- playbooks/groups/elections.yml | 2 +- playbooks/groups/fas.yml | 2 +- playbooks/groups/fedimg.yml | 2 +- playbooks/groups/fedocal.yml | 2 +- playbooks/groups/gallery.yml | 2 +- playbooks/groups/github2fedmsg.yml | 2 +- playbooks/groups/gnome-backups.yml | 2 +- playbooks/groups/hosted.yml | 2 +- playbooks/groups/hotness.yml | 2 +- playbooks/groups/infinote.yml | 2 +- playbooks/groups/ipsilon.yml | 2 +- playbooks/groups/kerneltest.yml | 2 +- playbooks/groups/keyserver.yml | 2 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/kojipkgs.yml | 2 +- playbooks/groups/koschei.yml | 2 +- playbooks/groups/logserver.yml | 2 +- playbooks/groups/mailman.yml | 2 +- playbooks/groups/mariadb-server.yml | 2 +- playbooks/groups/mdapi.yml | 2 +- playbooks/groups/memcached.yml | 2 +- playbooks/groups/mirrorlist2.yml | 2 +- playbooks/groups/mirrormanager.yml | 2 +- playbooks/groups/noc.yml | 2 +- playbooks/groups/notifs-backend.yml | 2 +- playbooks/groups/notifs-web.yml | 2 +- playbooks/groups/nuancier.yml | 2 +- playbooks/groups/openqa-workers.yml | 2 +- playbooks/groups/openqa.yml | 2 +- playbooks/groups/openstack-compute-nodes.yml | 2 +- playbooks/groups/packages.yml | 2 +- playbooks/groups/pagure.yml | 2 +- playbooks/groups/paste.yml | 2 +- playbooks/groups/pdc.yml | 2 +- playbooks/groups/people.yml | 2 +- playbooks/groups/pkgdb.yml | 2 +- playbooks/groups/pkgs.yml | 2 +- playbooks/groups/postgresql-server.yml | 2 +- playbooks/groups/proxies.yml | 2 +- playbooks/groups/qa-stg.yml | 2 +- playbooks/groups/qadevel.yml | 2 +- playbooks/groups/releng-compose.yml | 2 +- playbooks/groups/resultsdb-dev.yml | 2 +- playbooks/groups/resultsdb-prod.yml | 2 +- playbooks/groups/resultsdb-stg.yml | 2 +- playbooks/groups/retrace.yml | 2 +- playbooks/groups/secondary.yml | 2 +- playbooks/groups/smtp-mm.yml | 2 +- playbooks/groups/statscache.yml | 2 +- playbooks/groups/summershum.yml | 2 +- playbooks/groups/sundries.yml | 2 +- playbooks/groups/tagger.yml | 2 +- playbooks/groups/taskotron-client-hosts.yml | 2 +- playbooks/groups/taskotron-dev.yml | 2 +- playbooks/groups/taskotron-prod.yml | 2 +- playbooks/groups/taskotron-stg.yml | 2 +- playbooks/groups/taskotron.yml | 2 +- playbooks/groups/torrent.yml | 2 +- playbooks/groups/unbound.yml | 2 +- playbooks/groups/value.yml | 2 +- playbooks/groups/virthost.yml | 2 +- playbooks/groups/wiki.yml | 2 +- .../cloud-noc01.cloud.fedoraproject.org.yml | 2 +- ...data-analysis01.phx2.fedoraproject.org.yml | 2 +- .../fed-cloud09.cloud.fedoraproject.org.yml | 2 +- playbooks/manual/kernel-qa.yml | 2 +- playbooks/manual/qadevel.yml | 2 +- roles/bodhi2/backend/tasks/main.yml | 2 +- roles/copr/backend/meta/main.yml | 2 +- roles/copr/backend/tasks/monitoring.yml | 2 +- roles/nagios_client/tasks/main.yml | 26 +++++++++---------- 99 files changed, 111 insertions(+), 111 deletions(-) diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 4daea85ee0..3d290d46a7 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -14,7 +14,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index e3c1ca6489..e52b1fb1a2 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index 4b7136d9ab..adbbed5d98 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -18,7 +18,7 @@ - rkhunter - hosts - fas_client - - nagios_client + - nagios/client - collectd/base - fedmsg/base - sudo diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index b40d7837d1..52c5ac4f9a 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -16,7 +16,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 281c3f2d79..269df8a7e9 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 0fc75b5c8b..2c4e58cf02 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -16,7 +16,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index db62590a7c..4da9c3e8f6 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index eb6a1b60a2..cff2680507 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 3b854a1687..09e0bd5f14 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml index faa12b9371..9badfc600b 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - ansible-server diff --git a/playbooks/groups/beaker-stg.yml b/playbooks/groups/beaker-stg.yml index 07dee88a37..ab1fa2549b 100644 --- a/playbooks/groups/beaker-stg.yml +++ b/playbooks/groups/beaker-stg.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index 7664ebadf9..98168ad3cc 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 3322778d6d..8f57485eb5 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index dbfbadf6a7..3916a988df 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -14,7 +14,7 @@ - base - hosts - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 62de85d982..47a7f86878 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -21,7 +21,7 @@ roles: - base - - nagios_client + - nagios/client - collectd/base - hosts - builder_repo diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index 709496d5fe..cb080227ab 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml index 4851a75f56..beecc4abb3 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - collectd/base - hosts - fas_client diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 35fa9b86a0..6b1e17b682 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index af2c4bf1ea..0b6652221d 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml index 381f5d2f06..a447c4508f 100644 --- a/playbooks/groups/composers.yml +++ b/playbooks/groups/composers.yml @@ -19,7 +19,7 @@ roles: - base - - nagios_client + - nagios/client - collectd/base - hosts - builder_repo diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index 0d770aa0cf..65b352f5d1 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -21,7 +21,7 @@ - collectd/base - fas_client - hosts - - nagios_client + - nagios/client - rsyncd - sudo - redis diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 58ce2e48f5..24c3cff870 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -21,7 +21,7 @@ - collectd/base - fas_client - hosts - - nagios_client + - nagios/client - rsyncd - sudo - { role: openvpn/client, when: env != "staging" } diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 41bcd2bd6b..9e9ad5116d 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -23,7 +23,7 @@ - collectd/base - fas_client - hosts - - nagios_client + - nagios/client - rsyncd - sudo - { role: openvpn/client, when: env != "staging" } diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 23dbaf2f74..9e343c00aa 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 1b361e58e7..d0c34bb443 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index fd11d31321..41ef279161 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -16,7 +16,7 @@ - base - hosts - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - rsyncd diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 8bb7a01a51..c7b1233201 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index b035a69da7..d898a7dfcf 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -29,7 +29,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index b34fc91e91..756fc372bd 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 48bb2541a4..bff9deb6f9 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -16,7 +16,7 @@ - base - hosts - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - rsyncd diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 5243187b44..11ec71714c 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -17,7 +17,7 @@ - base - rkhunter - fas_client - - nagios_client + - nagios/client - hosts - collectd/base - fedmsg/base diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 05fb8344d2..3bee8eaa47 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 61e2e3c610..90ebcfbdfa 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - fedmsg/base diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 77f3f3bb67..ac8264afbc 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 87a0f7f6ff..163087cac9 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/hosted.yml b/playbooks/groups/hosted.yml index 7cedf5ddbe..5679dd233a 100644 --- a/playbooks/groups/hosted.yml +++ b/playbooks/groups/hosted.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index ab9fa3e7df..0ccfadbd93 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - collectd/base - hosts - fas_client diff --git a/playbooks/groups/infinote.yml b/playbooks/groups/infinote.yml index b6751e2c37..c095f394a9 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -14,7 +14,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index fc5131e3cb..5706119e80 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 70d3042b88..46ec3b8c2d 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index cf3179808c..1de72c986f 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 48427f4d1e..674fc87577 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -19,7 +19,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - builder_repo diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 06d17edcd0..e785ea2243 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/koschei.yml b/playbooks/groups/koschei.yml index 52d20bb16f..0dce075514 100644 --- a/playbooks/groups/koschei.yml +++ b/playbooks/groups/koschei.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - builder_repo diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 7d2d837473..5ed0f5acb8 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - apache diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 3fc0d7586b..471596ae97 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index e9cb8f4aa6..ee038e073e 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -20,7 +20,7 @@ - base - rkhunter - fas_client - - nagios_client + - nagios/client - hosts - mariadb_server - collectd/base diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index 0355282086..0906f6bc92 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 794c2bf9d8..b9593d5cd6 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 5908beb54d..248cf4f0d8 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -50,7 +50,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - geoip - hosts - fas_client diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index f4a222c346..c535ad203a 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 159a97eb46..5756c6f8d5 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 02b3a864f1..aedca22134 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -20,7 +20,7 @@ - rkhunter - hosts - fas_client - - nagios_client + - nagios/client - collectd/base - fedmsg/base - sudo diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 14c4f59bbb..afb8c7f133 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 0be21e7f6b..1d48752d3e 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml index 235af89f00..a41e7ae88c 100644 --- a/playbooks/groups/openqa-workers.yml +++ b/playbooks/groups/openqa-workers.yml @@ -11,7 +11,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 8072e3bd32..ce698e92ce 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -13,7 +13,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml index 15480f3679..fee6967436 100644 --- a/playbooks/groups/openstack-compute-nodes.yml +++ b/playbooks/groups/openstack-compute-nodes.yml @@ -14,7 +14,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - sudo diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 896a55dc01..81e89971d4 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 61f7f53536..a1a9a1b4ee 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - sudo diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index 142d5d1436..b58b653e9e 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index bb1183fdc8..49e0fe1bb7 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -16,7 +16,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - collectd/base - hosts - fas_client diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index a43a6f5b7a..98145f7bd1 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -59,7 +59,7 @@ - collectd/base - fas_client - hosts - - nagios_client + - nagios/client - rkhunter - rsyncd - sudo diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index d3035ebc52..95b70ff39e 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index a155ed622e..0f810d41ef 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - sudo diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 8d2e97219c..8cf1d869e2 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -20,7 +20,7 @@ - base - rkhunter - fas_client - - nagios_client + - nagios/client - hosts - postgresql_server - collectd/base diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 379071f63c..6042231455 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - sudo diff --git a/playbooks/groups/qa-stg.yml b/playbooks/groups/qa-stg.yml index 2755d77c70..48b5b97c70 100644 --- a/playbooks/groups/qa-stg.yml +++ b/playbooks/groups/qa-stg.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - hosts - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index b345dbb677..3e0e89e4ed 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - hosts - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 37c64a3587..3bbfb5f39f 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -17,7 +17,7 @@ - hosts - fas_client - rkhunter - - nagios_client + - nagios/client - sudo - role: nfs/client mnt_dir: '/mnt/fedora_koji' diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index f05882c090..3b6fdb32c4 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 449480df96..8d538650e0 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 3b840153f5..4cacbbdf1f 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 7ca6b7f0d4..732d4a21bc 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -14,7 +14,7 @@ - hosts - fas_client - rkhunter - - nagios_client + - nagios/client - sudo - fedmsg/base diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 45a5e794b6..8ded59553c 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 90c4c24491..44db4552c1 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index 4c0ce873cc..3d1cd1e728 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -19,7 +19,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 52a8763a76..77df8ca268 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - collectd/base - hosts - fas_client diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index a049410c10..49cdcc46b8 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index d9a106fe8a..ab32b1c73f 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml index 0d89360125..f395df7fb2 100644 --- a/playbooks/groups/taskotron-client-hosts.yml +++ b/playbooks/groups/taskotron-client-hosts.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index f408f6491f..36b2e9b735 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index c8e6db8282..633feaf924 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index dda7084c03..1c5ff498be 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 7588ba0bb9..aacc296115 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -18,7 +18,7 @@ roles: - { role: base, tags: ['base'] } - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } + - { role: nagios/client, tags: ['nagios/client'] } - { role: hosts, tags: ['hosts']} - { role: fas_client, tags: ['fas_client'] } - { role: collectd/base, tags: ['collectd_base'] } diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 9c663d2b86..295ad85e60 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -14,7 +14,7 @@ - base - hosts - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - rsyncd diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 26534d915a..6e8c62801c 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 3f68e6ae9f..fd1e84feb3 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 68eff6ae29..14f1ee5822 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 4c0f10f38c..1015c8e7c8 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -18,7 +18,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 95387f1444..aa824a2e46 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - hosts - fas_client - collectd/base diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 23da2558d7..c66e275a02 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -18,7 +18,7 @@ - rkhunter - hosts - fas_client - - nagios_client + - nagios/client - collectd/base - sudo diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 16861a20ad..74c2db0307 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -36,7 +36,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - sudo diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index 6b184a0646..b7b9daed4a 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - sudo - hosts diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index 790e284370..6105d36fac 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - nagios_client + - nagios/client - fas_client - collectd/base - sudo diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 7a21bca961..77528bc2b8 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -48,7 +48,7 @@ user: name=nrpe groups=masher append=yes tags: - fedmsgmonitor - - nagios_client + - nagios/client - name: change owner and group attributes of bodhi.pem file file: > diff --git a/roles/copr/backend/meta/main.yml b/roles/copr/backend/meta/main.yml index d84917b7ae..9c40a7c753 100644 --- a/roles/copr/backend/meta/main.yml +++ b/roles/copr/backend/meta/main.yml @@ -1,5 +1,5 @@ --- dependencies: - { role: copr/base } - - { role: nagios_client } + - { role: nagios/client } # - { role: collectd/base } diff --git a/roles/copr/backend/tasks/monitoring.yml b/roles/copr/backend/tasks/monitoring.yml index 938b7e7b9b..8ce3fee003 100644 --- a/roles/copr/backend/tasks/monitoring.yml +++ b/roles/copr/backend/tasks/monitoring.yml @@ -3,7 +3,7 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client - name: set acl for nrpe on /etc/copr acl: name=/etc/copr entity=nrpe etype=user permissions=rx state=present diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index fb172929c9..325a1e2c43 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -16,7 +16,7 @@ - nagios-plugins-ping tags: - packages - - nagios_client + - nagios/client when: ansible_distribution_major_version|int < 22 # install pkgs: @@ -34,7 +34,7 @@ - nagios-plugins-ping tags: - packages - - nagios_client + - nagios/client when: ansible_distribution_major_version|int > 21 - name: install local nrpe check scripts that are not packaged @@ -57,7 +57,7 @@ - check_testcloud when: not inventory_hostname.startswith('noc') tags: - - nagios_client + - nagios/client # create dirs # puppet used to make /var/spool/nagios (owned by nagios.nagios) mode 750 @@ -89,7 +89,7 @@ - restart nrpe tags: - config - - nagios_client + - nagios/client # # The actual items files here end in .j2 (they are templates) @@ -127,7 +127,7 @@ - restart nrpe tags: - config - - nagios_client + - nagios/client # # The actual items files here end in .j2 (they are templates) @@ -139,7 +139,7 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client # # The actual items files here end in .j2 (they are templates) # So when adding or modifying them change the .j2 version in git. @@ -150,7 +150,7 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client # # The actual items files here end in .j2 (they are templates) # So when adding or modifying them change the .j2 version in git. @@ -161,7 +161,7 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client # # The actual items files here end in .j2 (they are templates) # So when adding or modifying them change the .j2 version in git. @@ -172,7 +172,7 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client - name: install nrpe checks for proxies template: src={{ item }}.j2 dest=/etc/nrpe.d/{{ item }} @@ -183,13 +183,13 @@ notify: - restart nrpe tags: - - nagios_client + - nagios/client - name: nrpe service start service: name=nrpe state=running enabled=true tags: - service - - nagios_client + - nagios/client - name: Check if the fedmsg group exists shell: /usr/bin/getent group fedmsg | /usr/bin/wc -l | tr -d ' ' @@ -197,10 +197,10 @@ always_run: true changed_when: "1 != 1" tags: - - nagios_client + - nagios/client - name: Add nrpe user to the fedmsg group if it exists user: name=nrpe groups=fedmsg append=yes when: fedmsg_exists.stdout == "1" tags: - - nagios_client + - nagios/client