s/nagios_client/nagios\/client/g

2016-02-23 02:33:30 +00:00 · 2016-02-23 02:33:30 +00:00 · 2226a9eae9
commit 2226a9eae9
parent f98a4d4efe
99 changed files with 111 additions and 111 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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" }
--- 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" }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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'] }
--- 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'] }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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'] }
--- 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'] }
--- 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'
--- 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'] }
--- 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'] }
--- 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'] }
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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'] }
--- 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'] }
--- 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'] }
--- 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'] }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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: >
--- 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 }
--- 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
--- 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