diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 3809bd967c..baeae77962 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 2fc89b60ef..f1bed3c506 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 1924baf9e4..b849bd876a 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 5554da6a91..e5277b0724 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/backup-server.yml b/playbooks/groups/backup-server.yml index 353b43c2dd..944ed8dffb 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 e519c76e22..14169d4143 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 ffa4467052..75f4c94acb 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/basset.yml b/playbooks/groups/basset.yml index cdf511aa93..a53e99ddeb 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -15,7 +15,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 6e02bc7091..aa1dab5339 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 cbd3abdb4a..64a97283b2 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-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index 856ee8540c..109fee1819 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 13c4b96550..6a8bc24ec1 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 e80a76a111..e195795630 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 fff3efc7e1..9140c6c158 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 0abce785e5..4d057eff12 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 399f3aaecc..8a7800338d 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 06e073e342..d9d264d821 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 00cb88c2ca..45e02b4c71 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/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index 669404157c..7df789f355 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 - rkhunter diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index ddc4d419aa..50a06c6784 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 - rkhunter - rsyncd - sudo diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 1d8f180a49..0bcd08cd05 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -22,7 +22,7 @@ - fas_client - rkhunter - 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 5f19fe3b05..c1751ff442 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 2a2074135b..8cb32b06b7 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 46a6b89e8b..f56012e3ec 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 - collectd/bind diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml index 257c1961b3..980b983fba 100644 --- a/playbooks/groups/docker-registry.yml +++ b/playbooks/groups/docker-registry.yml @@ -14,7 +14,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 e82b86dff7..32f186105c 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 6e11e652f6..2cf9e747d4 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 6d6b13f4ac..fedc4c00d1 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/fas3.yml b/playbooks/groups/fas3.yml index 6bef9f552d..f6ea71da03 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.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 92743c9628..abddaeac93 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 6d4cbb6693..3fefb8a33f 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/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 89bb97aae6..05da0da440 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 48b0070931..2f2a0183ef 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 a3a9536b2f..29aa110475 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 a863f2ef78..abc5c69315 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 f066188f3a..f503a46dd8 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/ipa.yml b/playbooks/groups/ipa.yml index b6682a2878..6783fcf3b7 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 77f7890a35..8f7cbcfb04 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 3dbccb6523..54908ab364 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 286c56ecf5..2707c77053 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 11c80d179a..4f7d3e669c 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -23,7 +23,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 4a6bfaf3f0..fd330e2457 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-backend.yml b/playbooks/groups/koschei-backend.yml index 2d67ce9862..b96b3df55a 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -16,7 +16,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - builder_repo diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index cd1c919c1c..047011bbd5 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -14,7 +14,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 362ef91539..4a7646461d 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/loopabull.yml b/playbooks/groups/loopabull.yml index 425953dd83..192115e1f9 100644 --- a/playbooks/groups/loopabull.yml +++ b/playbooks/groups/loopabull.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 1d70e52173..64dad63fa3 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 58814d37ee..3633f4219d 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/mbs.yml b/playbooks/groups/mbs.yml index 365edb61d9..69edb91f7f 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -16,7 +16,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - rsyncd diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index 5d59f8b36d..f6f9a2046b 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -16,7 +16,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 f3660f2a39..e8dfb20e30 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 68381419ff..d307275bfa 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 d481110210..746ae1a45a 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/modernpaste.yml b/playbooks/groups/modernpaste.yml index 1a28e43194..0b7b2bd514 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -18,7 +18,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 c5c153dc5f..928b0dd0a8 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 58de8307b6..4bd46b99bf 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 cf5e492346..784a6f9764 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 d9a2234693..d34748d700 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 b58273550e..0966aa8667 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 7bb4b75d61..15066ea00d 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 2340137440..503dca2a34 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/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 5d9ff0ab6d..726bb92795 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index ac256395e1..7d3cabd8bd 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 099a795fe0..88bf0b7969 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 c26c34e106..0d02d948cf 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 88d329b16d..1e46069a4b 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 31f81e42fa..7877950c07 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/piwik.yml b/playbooks/groups/piwik.yml index 914e94cb84..1f89218a60 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 87aaa743b8..98d211e6d9 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 64b601c85e..fa0f3c64e4 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-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index e2a63cca1a..d07290b3b3 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -20,7 +20,7 @@ - base - rkhunter - fas_client - - nagios/client + - nagios_client - hosts - collectd/base - collectd/postgres # This requires a 'databases' var to be set in host_vars diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index ae0bd03567..8d78b542dd 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 b4e22dedc0..d86eb2a16e 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - collectd/base - sudo - rsyncd diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index d5573d6452..978ad8e0ba 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.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 fdd7b38baa..1e1f7120e3 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -26,7 +26,7 @@ - builder_repo - fas_client - rkhunter - - nagios/client + - nagios_client - collectd/base - sudo - role: keytab/service diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 141230e0d6..c021506d54 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 4e617f126c..cab0770d24 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 cda7459b5b..7aa517212b 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 502a437a01..400625c711 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -15,7 +15,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 b8207f6237..f81a5915b4 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 e0d806d4a3..d93e46f816 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 65725401f9..f1fb38f0b2 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 1706c6ad08..81f70ad0c0 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 729cf9af15..b71977add9 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 8bb044cf20..7734daa9fa 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 4996dbc2fa..dd4dedddd4 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 093da6047f..a5ba557833 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 184b11b001..2894c88620 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 282094aa82..652583c59a 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 d6590747fc..701e427f89 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 1d69ed68ab..b196ca95ac 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 76de92e130..a3e3e02778 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 a0fbba22ee..e907c43936 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 dc4cfdc8e7..43f9b4c76c 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -18,7 +18,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 1e5adae54b..07c32717ec 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -21,7 +21,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 8365e93de3..687d77c015 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.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 e678d4c97b..49e9070ddd 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 b53b0b4190..5be664e24a 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 - role: keytab/service diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index e830789f4b..501d95e65f 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/hosts/magazine.fedorainfracloud.org.yml b/playbooks/hosts/magazine.fedorainfracloud.org.yml index e42e2c44b4..b0d219a85f 100644 --- a/playbooks/hosts/magazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine.fedorainfracloud.org.yml @@ -51,5 +51,5 @@ service: name=postfix enabled=yes state=started roles: - - nagios/client + - nagios_client - mariadb_server diff --git a/playbooks/hosts/piwik.fedorainfracloud.org.yml b/playbooks/hosts/piwik.fedorainfracloud.org.yml index ab8d538522..d7a65167db 100644 --- a/playbooks/hosts/piwik.fedorainfracloud.org.yml +++ b/playbooks/hosts/piwik.fedorainfracloud.org.yml @@ -29,7 +29,7 @@ - apache - base - piwik - - nagios/client + - nagios_client pre_tasks: - include: "{{ tasks_path }}/yumrepos.yml" diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index cb07eda7fc..fc98513e3f 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -19,7 +19,7 @@ roles: - base - rkhunter - - nagios/client + - nagios_client - hosts - fas_client - collectd/base diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index 72c25a58a7..ccfa6ba2cb 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 b569021061..e8d64a2ee6 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 4768231686..2b6ff230cf 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -63,7 +63,7 @@ user: name=nrpe groups=apache append=yes tags: - fedmsgmonitor - - nagios/client + - nagios_client - name: install bodhi.pem file copy: > diff --git a/roles/copr/backend/meta/main.yml b/roles/copr/backend/meta/main.yml index 9c40a7c753..d84917b7ae 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 8ce3fee003..938b7e7b9b 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