diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index 09633d2740..64b69d17bc 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -15,12 +15,12 @@ - base - rkhunter - denyhosts + - hosts - fas_client - sudo tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index dd720d23b8..5935790a78 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -15,12 +15,12 @@ - base - rkhunter - denyhosts + - hosts - fas_client - sudo tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/arm-releng.yml index af3a57d71d..6ed2b844aa 100644 --- a/playbooks/groups/arm-releng.yml +++ b/playbooks/groups/arm-releng.yml @@ -13,6 +13,7 @@ roles: - base + - hosts - fas_client - rkhunter - denyhosts @@ -21,7 +22,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/common_scripts.yml" diff --git a/playbooks/groups/arm-retrace.yml b/playbooks/groups/arm-retrace.yml index e5d2abed68..29617a4af1 100644 --- a/playbooks/groups/arm-retrace.yml +++ b/playbooks/groups/arm-retrace.yml @@ -13,6 +13,7 @@ roles: - base + - hosts - fas_client - rkhunter - denyhosts @@ -21,7 +22,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/common_scripts.yml" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 007d2f97ec..b9c38cccb1 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -32,6 +32,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - ask @@ -40,7 +41,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/atomic.yml b/playbooks/groups/atomic.yml index 188a2da114..0ce77bf71b 100644 --- a/playbooks/groups/atomic.yml +++ b/playbooks/groups/atomic.yml @@ -14,11 +14,11 @@ roles: - base + - hosts - fas_client - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 287573afb5..7d0a583d26 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - autosigner - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index a3ee3bf6ec..6347ecc794 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -19,11 +19,11 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 6b38a89ff9..8cc71c5b04 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 5ec7bf4147..4f3325b62e 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -36,6 +36,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - badges/frontend @@ -44,7 +45,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 47f5633ee6..1efbe5ed03 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -33,13 +33,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - sudo tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index ac3cbbf3f8..e19e9568b1 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -30,6 +30,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - { role: bodhi/base, when: "inventory_hostname.startswith('bodhi01') or inventory_hostname.startswith('bodhi02')" } @@ -40,7 +41,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 9ef479d3d1..d93e41f78d 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -35,13 +35,13 @@ - rkhunter # - denyhosts - nagios_client + - hosts - fas_client - sudo - collectd/base - fedmsg/base tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 3e438aedb4..bb74ab85ba 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -17,10 +17,10 @@ - { role: nfs/client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - koji_builder - { role: bkernel, when: inventory_hostname.startswith('bkernel') } + - hosts tasks: - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/hosts.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 8172c16e5e..b9b1c228f3 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -33,12 +33,12 @@ roles: - base + - hosts - { role: nfs/client, when: not inventory_hostname.startswith('arm'), mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - { role: nfs/client, when: datacenter == 'staging', mnt_dir: '/mnt/koji', nfs_src_dir: '/mnt/koji' } - koji_builder tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - name: make sure kojid is running diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 3b788b3a57..2f492b476d 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -31,6 +31,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - yum-cron @@ -38,7 +39,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index f418e5f9e1..7b1351a5dd 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -51,6 +51,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - download @@ -61,7 +62,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 497e5cd434..cd2ea01399 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -31,12 +31,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index 9debab9908..eb91bffb25 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -36,12 +36,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 6466058f05..a54343947a 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -36,12 +36,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index 00e47cd7d8..ef70dbee78 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -36,12 +36,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - fedmsg/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 2ed89adf93..863c367423 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index c5552a4a67..73123be9d6 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 8aaaad0361..ac7590a3a8 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - fedmsg/base - keyserver - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 7737e3ea24..a750ec71d4 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -35,6 +35,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base @@ -44,7 +45,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/lockbox.yml b/playbooks/groups/lockbox.yml index 81e1833ebd..d9dacc9f3d 100644 --- a/playbooks/groups/lockbox.yml +++ b/playbooks/groups/lockbox.yml @@ -29,12 +29,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - ansible-server - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index eb5a53419b..f24c17f8fa 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -36,6 +36,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - yum-cron @@ -43,7 +44,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index 832fadf45c..1c3f471ed5 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - geoip + - hosts - fas_client - collectd/base - mirrorlist @@ -44,7 +45,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 652bc648ee..2df81cf49d 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 3540b96a0f..87d682e115 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -36,6 +36,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base @@ -43,7 +44,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 8f41fc025a..2eac1cd970 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -36,12 +36,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 603a662f23..569d80cd1a 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -36,13 +36,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index 329e1b406a..611b3d4954 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -32,6 +32,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - paste @@ -39,7 +40,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 4a9c9ae3dc..4bc0ab3c53 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -36,12 +36,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml index ff32883bbd..55397798a0 100644 --- a/playbooks/groups/postgresl-server.yml +++ b/playbooks/groups/postgresl-server.yml @@ -37,6 +37,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - postgresql_server - collectd/base @@ -44,7 +45,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml index 77516725af..7df0bc9d55 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -37,11 +37,11 @@ - base - nagios_client - collectd/base + - hosts - fedmsg/base tasks: - include: "{{ tasks }}/koji/releng_config.yml" - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/motd.yml" handlers: diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index b38226b2ef..c4fc52cf09 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -35,6 +35,7 @@ - { role: base, tags:['base'] } - { role: rkhunter, tags:['rkhunter'] } - { role: nagios_client, tags:['nagios_client'] } + - hosts - { role: fas_client, tags:['fas_client'] } - { role: collectd/base, tags:['collectd_base'] } - { role: yum-cron, tags:['yumcron'] } @@ -44,7 +45,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 6c5ecddfd4..51d132c3ed 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -32,12 +32,12 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index f08a2105ac..2e7e24a918 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -37,11 +37,11 @@ - denyhosts - nagios_client - collectd/base + - hosts - fas_client - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 79b85ae654..30626aeebd 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -36,6 +36,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - geoip @@ -52,7 +53,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index d5e72be729..e6a143e253 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -37,13 +37,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - rsyncd - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index ca235999db..11824c1113 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -34,6 +34,7 @@ - base - rkhunter - nagios_client + - hosts - fas_client - collectd/base - yum-cron @@ -41,7 +42,6 @@ tasks: # this is how you include other task lists - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index bc55abb76d..f3cb2546aa 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -32,13 +32,13 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - unbound - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 13ec1ce57b..11ab5e8de3 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -32,6 +32,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base @@ -42,7 +43,6 @@ process: fedmsg-irc tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index f918c53f2f..a38cabacb6 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -18,13 +18,13 @@ - rkhunter # - denyhosts - nagios_client + - hosts - fas_client - collectd/base - { role: iscsi_client, when: datacenter == "phx2" } - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 475ef5dc3d..c263264174 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -36,6 +36,7 @@ - rkhunter - denyhosts - nagios_client + - hosts - fas_client - collectd/base - fedmsg/base @@ -45,7 +46,6 @@ - sudo tasks: - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 90e9c12ca3..ebc981fbce 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -24,11 +24,11 @@ roles: - sudo + - hosts tasks: - include: "{{ tasks }}/cloud_setup_basic.yml" - include: "{{ tasks }}/postfix_basic.yml" - - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/apache.yml" diff --git a/files/hosts/arm.fedoraproject.org-hosts b/roles/hosts/files/arm.fedoraproject.org-hosts similarity index 100% rename from files/hosts/arm.fedoraproject.org-hosts rename to roles/hosts/files/arm.fedoraproject.org-hosts diff --git a/files/hosts/ask01.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/ask01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/ask01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/ask01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/ask01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/ask01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/ask02.phx2.fedoraproject.org-hosts b/roles/hosts/files/ask02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/ask02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/ask02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/autosign-hosts b/roles/hosts/files/autosign-hosts similarity index 100% rename from files/hosts/autosign-hosts rename to roles/hosts/files/autosign-hosts diff --git a/files/hosts/badges-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/badges-backend01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/badges-backend01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/badges-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-backend01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/badges-backend01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/badges-backend01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/badges-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/badges-web01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/badges-web01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/badges-web01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/badges-web01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/badges-web01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/badges-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/badges-web02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/badges-web02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/bodhi01.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/bodhi01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/bodhi01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/bodhi02.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/bodhi02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/bodhi02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/docs-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/docs-backend01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/docs-backend01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/elections01.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/elections01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/elections01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/elections01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/elections01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/elections01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/elections02.phx2.fedoraproject.org-hosts b/roles/hosts/files/elections02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/elections02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/elections02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/fedoauth01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedoauth01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/fedoauth01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/fedoauth01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/fedocal01.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/fedocal01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/fedocal01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/fedocal01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/fedocal01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/fedocal01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/fedocal02.phx2.fedoraproject.org-hosts b/roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/fedocal02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/fedocal02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/gallery01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/gallery01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/gallery01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/gallery01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/github2fedmsg01.phx2.fedoraproject.org-hosts b/roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/github2fedmsg01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/github2fedmsg01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/github2fedmsg01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/github2fedmsg01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/github2fedmsg01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/github2fedmsg01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/kerneltest01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/kerneltest01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/kerneltest01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/kerneltest01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/koji01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/koji01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/koji01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/kojibuilder-hosts b/roles/hosts/files/kojibuilder-hosts similarity index 100% rename from files/hosts/kojibuilder-hosts rename to roles/hosts/files/kojibuilder-hosts diff --git a/files/hosts/mailman01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/mailman01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/mailman01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/mailman01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-backend01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-backend01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-backend01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-backend01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-backend01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-backend01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-web01.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-web01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-web01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-web01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-web01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-web01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-web02.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-web02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-web02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/notifs-web02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/notifs-web02.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/notifs-web02.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/notifs-web02.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/nuancier01.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/nuancier01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/nuancier01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/nuancier01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/nuancier01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/nuancier01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/nuancier02.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/nuancier02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/nuancier02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/nuancier02.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/nuancier02.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/nuancier02.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/nuancier02.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/packages03.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/packages03.phx2.fedoraproject.org-hosts rename to roles/hosts/files/packages03.phx2.fedoraproject.org-hosts diff --git a/files/hosts/packages03.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/packages03.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/packages03.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/packages04.phx2.fedoraproject.org-hosts b/roles/hosts/files/packages04.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/packages04.phx2.fedoraproject.org-hosts rename to roles/hosts/files/packages04.phx2.fedoraproject.org-hosts diff --git a/files/hosts/pkgdb01.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/pkgdb01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/pkgdb01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/pkgdb01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/pkgdb01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/pkgdb01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/pkgdb02.phx2.fedoraproject.org-hosts b/roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/pkgdb02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/pkgdb02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/qa.fedoraproject.org-hosts b/roles/hosts/files/qa.fedoraproject.org-hosts similarity index 100% rename from files/hosts/qa.fedoraproject.org-hosts rename to roles/hosts/files/qa.fedoraproject.org-hosts diff --git a/files/hosts/releng-hosts b/roles/hosts/files/releng-hosts similarity index 100% rename from files/hosts/releng-hosts rename to roles/hosts/files/releng-hosts diff --git a/files/hosts/sign-hosts b/roles/hosts/files/sign-hosts similarity index 100% rename from files/hosts/sign-hosts rename to roles/hosts/files/sign-hosts diff --git a/files/hosts/staging-hosts b/roles/hosts/files/staging-hosts similarity index 100% rename from files/hosts/staging-hosts rename to roles/hosts/files/staging-hosts diff --git a/files/hosts/summershum01.phx2.fedoraproject.org-hosts b/roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/summershum01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/summershum01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/summershum01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/summershum01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/summershum01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/summershum01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/tagger01.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/tagger01.phx2.fedoraproject.org-hosts rename to roles/hosts/files/tagger01.phx2.fedoraproject.org-hosts diff --git a/files/hosts/tagger01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/tagger01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/tagger01.stg.phx2.fedoraproject.org-hosts diff --git a/files/hosts/tagger02.phx2.fedoraproject.org-hosts b/roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/tagger02.phx2.fedoraproject.org-hosts rename to roles/hosts/files/tagger02.phx2.fedoraproject.org-hosts diff --git a/files/hosts/wiki01.stg.phx2.fedoraproject.org-hosts b/roles/hosts/files/wiki01.stg.phx2.fedoraproject.org-hosts similarity index 100% rename from files/hosts/wiki01.stg.phx2.fedoraproject.org-hosts rename to roles/hosts/files/wiki01.stg.phx2.fedoraproject.org-hosts diff --git a/tasks/hosts.yml b/roles/hosts/tasks/main.yml similarity index 100% rename from tasks/hosts.yml rename to roles/hosts/tasks/main.yml