Move hosts to a role and put it before fas_client so initial runs can find admin.

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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:

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"