From 61649f6d0624f1d66c45400d548c3e01876af9de Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 22 Jun 2014 22:43:18 +0000 Subject: [PATCH 01/11] Move bugzilla2fedmsg01.stg to new vh18 to test rhel7 as vh --- .../host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org b/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org index ebe70e291b..53b12f584e 100644 --- a/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bugzilla2fedmsg01.stg.phx2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -volgroup: /dev/vg_virthost16 -vmhost: virthost16.phx2.fedoraproject.org +volgroup: /dev/vg_virthost +vmhost: virthost18.phx2.fedoraproject.org datacenter: phx2 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 From 8764d6afa2781a3db62f95aaa25c94bab2cd89c3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 22 Jun 2014 22:46:23 +0000 Subject: [PATCH 02/11] virt-install is in path and in a different place in rhel7 --- inventory/group_vars/all | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index fd652119aa..297d8f2a5b 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -34,7 +34,7 @@ lvm_size: 20000 # gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 # hostname={{ inventory_hostname }}" # --network=bridge=br0 --autostart --noautoconsole -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} +virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }} -l {{ ks_repo }} -x "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 From 7c51d2e49703df54279105cdbeb45a288ab604b3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 22 Jun 2014 23:01:05 +0000 Subject: [PATCH 03/11] Add a fas_client for only initial installs --- roles/fas_client/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/roles/fas_client/tasks/main.yml b/roles/fas_client/tasks/main.yml index f912374ce5..38dcdc9d3e 100644 --- a/roles/fas_client/tasks/main.yml +++ b/roles/fas_client/tasks/main.yml @@ -68,3 +68,8 @@ copy: src=fas-client.cron dest=/etc/cron.d/fas-client owner=root mode=644 tags: - config + +- name: run fas_client only if we just installed + command: fasClient -if creates=/var/db/shadow.db + tags: + - config From 800c03d37ec181c02e7a9786e035c126567b18e4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 00:49:31 +0000 Subject: [PATCH 04/11] Move hosts to a role and put it before fas_client so initial runs can find admin. --- playbooks/groups/arm-packager.yml | 2 +- playbooks/groups/arm-qa.yml | 2 +- playbooks/groups/arm-releng.yml | 2 +- playbooks/groups/arm-retrace.yml | 2 +- playbooks/groups/ask.yml | 2 +- playbooks/groups/atomic.yml | 2 +- playbooks/groups/autosign.yml | 2 +- playbooks/groups/backup-server.yml | 2 +- playbooks/groups/badges-backend.yml | 2 +- playbooks/groups/badges-web.yml | 2 +- playbooks/groups/beaker.yml | 2 +- playbooks/groups/bodhi.yml | 2 +- playbooks/groups/bugzilla2fedmsg.yml | 2 +- playbooks/groups/buildhw.yml | 2 +- playbooks/groups/buildvm.yml | 2 +- playbooks/groups/docs-backend.yml | 2 +- playbooks/groups/download.yml | 2 +- playbooks/groups/elections.yml | 2 +- playbooks/groups/fedoauth.yml | 2 +- playbooks/groups/fedocal.yml | 2 +- playbooks/groups/gallery.yml | 2 +- playbooks/groups/github2fedmsg.yml | 2 +- playbooks/groups/kerneltest.yml | 2 +- playbooks/groups/keyserver.yml | 2 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/lockbox.yml | 2 +- playbooks/groups/mailman.yml | 2 +- playbooks/groups/mirrorlist.yml | 2 +- playbooks/groups/notifs-backend.yml | 2 +- playbooks/groups/notifs-web.yml | 2 +- playbooks/groups/nuancier.yml | 2 +- playbooks/groups/packages.yml | 2 +- playbooks/groups/paste.yml | 2 +- playbooks/groups/pkgdb.yml | 2 +- playbooks/groups/postgresl-server.yml | 2 +- playbooks/groups/releng.yml | 2 +- playbooks/groups/resultsdb-stg.yml | 2 +- playbooks/groups/smtp-mm.yml | 2 +- playbooks/groups/summershum.yml | 2 +- playbooks/groups/sundries.yml | 2 +- playbooks/groups/tagger.yml | 2 +- playbooks/groups/taskotron.yml | 2 +- playbooks/groups/unbound.yml | 2 +- playbooks/groups/value.yml | 2 +- playbooks/groups/virthost.yml | 2 +- playbooks/groups/wiki.yml | 2 +- playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml | 2 +- {files/hosts => roles/hosts/files}/arm.fedoraproject.org-hosts | 0 .../hosts/files}/ask01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/ask01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/ask02.phx2.fedoraproject.org-hosts | 0 {files/hosts => roles/hosts/files}/autosign-hosts | 0 .../hosts/files}/badges-backend01.phx2.fedoraproject.org-hosts | 0 .../files}/badges-backend01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/badges-web01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/badges-web01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/badges-web02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/bodhi01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/bodhi02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/docs-backend01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/elections01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/elections01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/elections02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/fedoauth01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/fedocal01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/fedocal01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/fedocal02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/gallery01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/github2fedmsg01.phx2.fedoraproject.org-hosts | 0 .../files}/github2fedmsg01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/kerneltest01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/koji01.stg.phx2.fedoraproject.org-hosts | 0 {files/hosts => roles/hosts/files}/kojibuilder-hosts | 0 .../hosts/files}/mailman01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/notifs-backend01.phx2.fedoraproject.org-hosts | 0 .../files}/notifs-backend01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/notifs-web01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/notifs-web01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/notifs-web02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/notifs-web02.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/nuancier01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/nuancier01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/nuancier02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/nuancier02.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/packages03.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/packages03.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/packages04.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/pkgdb01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/pkgdb01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/pkgdb02.phx2.fedoraproject.org-hosts | 0 {files/hosts => roles/hosts/files}/qa.fedoraproject.org-hosts | 0 {files/hosts => roles/hosts/files}/releng-hosts | 0 {files/hosts => roles/hosts/files}/sign-hosts | 0 {files/hosts => roles/hosts/files}/staging-hosts | 0 .../hosts/files}/summershum01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/summershum01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/tagger01.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/tagger01.stg.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/tagger02.phx2.fedoraproject.org-hosts | 0 .../hosts/files}/wiki01.stg.phx2.fedoraproject.org-hosts | 0 tasks/hosts.yml => roles/hosts/tasks/main.yml | 0 101 files changed, 47 insertions(+), 47 deletions(-) rename {files/hosts => roles/hosts/files}/arm.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/ask01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/ask01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/ask02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/autosign-hosts (100%) rename {files/hosts => roles/hosts/files}/badges-backend01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/badges-backend01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/badges-web01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/badges-web01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/badges-web02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/bodhi01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/bodhi02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/docs-backend01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/elections01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/elections01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/elections02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/fedoauth01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/fedocal01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/fedocal01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/fedocal02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/gallery01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/github2fedmsg01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/github2fedmsg01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/kerneltest01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/koji01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/kojibuilder-hosts (100%) rename {files/hosts => roles/hosts/files}/mailman01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-backend01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-backend01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-web01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-web01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-web02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/notifs-web02.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/nuancier01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/nuancier01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/nuancier02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/nuancier02.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/packages03.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/packages03.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/packages04.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/pkgdb01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/pkgdb01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/pkgdb02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/qa.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/releng-hosts (100%) rename {files/hosts => roles/hosts/files}/sign-hosts (100%) rename {files/hosts => roles/hosts/files}/staging-hosts (100%) rename {files/hosts => roles/hosts/files}/summershum01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/summershum01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/tagger01.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/tagger01.stg.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/tagger02.phx2.fedoraproject.org-hosts (100%) rename {files/hosts => roles/hosts/files}/wiki01.stg.phx2.fedoraproject.org-hosts (100%) rename tasks/hosts.yml => roles/hosts/tasks/main.yml (100%) 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 From 3a0d2d4483860dde341efe4ab04507490f8ac4c1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 01:01:24 +0000 Subject: [PATCH 05/11] Fix paths --- roles/hosts/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml index a28ef07ecc..43264b59f6 100644 --- a/roles/hosts/tasks/main.yml +++ b/roles/hosts/tasks/main.yml @@ -13,10 +13,10 @@ action: copy src={{ item }} dest=/etc/hosts with_first_found: - files: - - "{{ files }}/hosts/{{ ansible_fqdn }}-hosts" - - "{{ files }}/hosts/{{ ansible_hostname }}-hosts" - - "{{ files }}/hosts/{{ ansible_domain }}-hosts" - - "{{ files }}/hosts/{{ host_group }}-hosts" + - "{{ ansible_fqdn }}-hosts" + - "{{ ansible_hostname }}-hosts" + - "{{ ansible_domain }}-hosts" + - "{{ host_group }}-hosts" skip: true tags: - config From 5c3d38c357cb93e8d6397680817551207a3ff5ae Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 02:05:35 +0000 Subject: [PATCH 06/11] Add a profile thing for a few runs. --- callback_plugins/profile_tasks.py | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 callback_plugins/profile_tasks.py diff --git a/callback_plugins/profile_tasks.py b/callback_plugins/profile_tasks.py new file mode 100644 index 0000000000..9d8fd06c7e --- /dev/null +++ b/callback_plugins/profile_tasks.py @@ -0,0 +1,40 @@ +import time + + +class CallbackModule(object): + """ + A plugin for timing tasks + """ + def __init__(self): + self.stats = {} + self.current = None + + def playbook_on_task_start(self, name, is_conditional): + """ + Logs the start of each task + """ + if self.current is not None: + # Record the running time of the last executed task + self.stats[self.current] = time.time() - self.stats[self.current] + + # Record the start time of the current task + self.current = name + self.stats[self.current] = time.time() + + def playbook_on_stats(self, stats): + """ + Prints the timings + """ + # Record the timing of the very last task + if self.current is not None: + self.stats[self.current] = time.time() - self.stats[self.current] + + # Sort the tasks by their running time + results = sorted(self.stats.items(), key=lambda value: value[1], reverse=True) + + # Just keep the top 10 + results = results[:10] + + # Print the timings + for name, elapsed in results: + print "{0:-<70}{1:->9}".format('{0} '.format(name), ' {0:.02f}s'.format(elapsed)) From 0de1159087bafdebdb49ff44609c72f3075a64d2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 02:27:45 +0000 Subject: [PATCH 07/11] These may need quoted? --- tasks/yumrepos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index b8805beaba..d5191c5935 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -4,7 +4,7 @@ with_items: - epel6.repo - rhel6.repo - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == 6 + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '6' tags: - config - packages @@ -14,7 +14,7 @@ with_items: - epel7.repo - rhel7.repo - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == 7 + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' tags: - config - packages From 1ebbc5ffce3f9ad3d039516969ac53f063a9062b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 03:21:11 +0000 Subject: [PATCH 08/11] Stay newline --- roles/base/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 342b1cebf7..97f00d5e4e 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -118,7 +118,6 @@ with_first_found: - rsyslog/rsyslog.conf.{{ dist_tag }} - rsyslog/rsyslog.conf.default - notify: - restart rsyslog tags: From e6e759d969646d8cb4438b0b2791432373b94937 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Jun 2014 04:09:25 +0000 Subject: [PATCH 09/11] Run rkhunter --propupd when installing or updating it's config --- handlers/restart_services.yml | 3 +++ roles/nuancier/tasks/main.yml | 2 +- roles/rkhunter/tasks/main.yml | 9 ++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index 90cfb67a41..03ca864702 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -100,3 +100,6 @@ - name: restart supervisord service: name=supervisord state=restarted + +- name: run rkhunter + command: rkhunter --propupd diff --git a/roles/nuancier/tasks/main.yml b/roles/nuancier/tasks/main.yml index 9e2844c060..9995db35f7 100644 --- a/roles/nuancier/tasks/main.yml +++ b/roles/nuancier/tasks/main.yml @@ -21,7 +21,7 @@ - name: copy sundry nuancier configuration template: src={{ item.file }} - dest="{{ item.location }}/{{ item.dest }}" + dest={{ item.location }}/{{ item.dest }} owner=apache group=apache mode=0600 with_items: - { file: nuancier_admin.cfg, location: /etc/nuancier, dest: nuancier.cfg } diff --git a/roles/rkhunter/tasks/main.yml b/roles/rkhunter/tasks/main.yml index 4bec0f7b13..0f68231e67 100644 --- a/roles/rkhunter/tasks/main.yml +++ b/roles/rkhunter/tasks/main.yml @@ -1,18 +1,21 @@ --- - - name: install rkhunter yum: name=rkhunter state=present + notify: + - run rkhunter tags: - packages - name: rkhunter.conf template: src=rkhunter.conf.j2 dest=/etc/rkhunter.conf mode=0640 + notify: + - run rkhunter tags: - config - name: rkhunter sysconfig copy: src=rkhunter.sysconfig dest=/etc/sysconfig/rkhunter mode=0640 + notify: + - run rkhunter tags: - config - - From be7168c79404937dc6242b3cce24e7192778e388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 23 Jun 2014 15:22:42 +0000 Subject: [PATCH 10/11] substitute only some vars during deployment on copr --- files/copr/provision/builderpb.yml | 3 ++- files/copr/provision/terminatepb.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/files/copr/provision/builderpb.yml b/files/copr/provision/builderpb.yml index 1cd61bbcb9..8220965236 100644 --- a/files/copr/provision/builderpb.yml +++ b/files/copr/provision/builderpb.yml @@ -1,3 +1,4 @@ +#jinja2:variable_start_string:'[%' , variable_end_string:'%]' --- - name: check/create instance hosts: localhost @@ -9,7 +10,7 @@ - OS_AUTH_URL: http://172.23.0.2:5000/v2.0 - OS_TENANT_NAME: copr - OS_USERNAME: msuchy - - OS_PASSWORD: {{ copr_nova_password }} + - OS_PASSWORD: [% copr_nova_password %] # rhel 6.4 2013-02-21 x86_64 - ami - image_id: cba0c766-84ac-4048-b0f5-6d4000af62f8 diff --git a/files/copr/provision/terminatepb.yml b/files/copr/provision/terminatepb.yml index d5da151e4b..d36f2000ee 100644 --- a/files/copr/provision/terminatepb.yml +++ b/files/copr/provision/terminatepb.yml @@ -1,3 +1,4 @@ +#jinja2:variable_start_string:'[%' , variable_end_string:'%]' --- - name: terminate instance hosts: all @@ -8,7 +9,7 @@ - OS_AUTH_URL: http://172.23.0.2:5000/v2.0 - OS_TENANT_NAME: copr - OS_USERNAME: msuchy - - OS_PASSWORD: {{ copr_nova_password }} + - OS_PASSWORD: [% copr_nova_password %] tasks: - name: terminate it From 3c529d3eee03b60f4bc6455f1f158ae022b33302 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 23 Jun 2014 18:06:09 +0000 Subject: [PATCH 11/11] send branched and rawhide cron output to releng-cron list --- files/releng/branched | 2 +- files/releng/rawhide | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/releng/branched b/files/releng/branched index 3c3be17105..f642d0f411 100644 --- a/files/releng/branched +++ b/files/releng/branched @@ -1,3 +1,3 @@ # branched compose -MAILTO=rel-eng@lists.fedoraproject.org +MAILTO=releng-cron@lists.fedoraproject.org 15 7 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildbranched $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora diff --git a/files/releng/rawhide b/files/releng/rawhide index 83f46db6eb..679b4a784f 100644 --- a/files/releng/rawhide +++ b/files/releng/rawhide @@ -1,3 +1,3 @@ # rawhide compose -MAILTO=rel-eng@lists.fedoraproject.org +MAILTO=releng-cron@lists.fedoraproject.org 15 5 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n git://git.fedorahosted.org/releng && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora