diff --git a/playbooks/groups/arm-packager.yml b/playbooks/groups/arm-packager.yml index 01dee845c0..09633d2740 100644 --- a/playbooks/groups/arm-packager.yml +++ b/playbooks/groups/arm-packager.yml @@ -16,13 +16,13 @@ - rkhunter - denyhosts - fas_client + - sudo tasks: # this is how you include other task lists - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/arm-qa.yml b/playbooks/groups/arm-qa.yml index e4fe6c70d8..dd720d23b8 100644 --- a/playbooks/groups/arm-qa.yml +++ b/playbooks/groups/arm-qa.yml @@ -16,13 +16,13 @@ - rkhunter - denyhosts - fas_client + - sudo tasks: # this is how you include other task lists - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/arm-releng.yml b/playbooks/groups/arm-releng.yml index 6c9190c663..af3a57d71d 100644 --- a/playbooks/groups/arm-releng.yml +++ b/playbooks/groups/arm-releng.yml @@ -17,6 +17,7 @@ - rkhunter - denyhosts - nagios_client + - sudo tasks: # this is how you include other task lists @@ -24,7 +25,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/common_scripts.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/koji/releng_config.yml" handlers: diff --git a/playbooks/groups/arm-retrace.yml b/playbooks/groups/arm-retrace.yml index d3fc3e0449..e5d2abed68 100644 --- a/playbooks/groups/arm-retrace.yml +++ b/playbooks/groups/arm-retrace.yml @@ -17,6 +17,7 @@ - rkhunter - denyhosts - nagios_client + - sudo tasks: # this is how you include other task lists @@ -24,7 +25,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/common_scripts.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index e2e91b3b8f..007d2f97ec 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -37,13 +37,13 @@ - ask - fedmsg/base - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/atomic.yml b/playbooks/groups/atomic.yml index 30a421ceef..188a2da114 100644 --- a/playbooks/groups/atomic.yml +++ b/playbooks/groups/atomic.yml @@ -15,13 +15,13 @@ roles: - base - fas_client + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 1c2e8f4800..287573afb5 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -39,13 +39,13 @@ - fas_client - collectd/base - autosigner + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index b3af139f0c..a3ee3bf6ec 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -20,13 +20,13 @@ - denyhosts - nagios_client - fas_client + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/rdiff_backup_server.yml" - name: Create GNOME backup user diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index b8e366e943..6b38a89ff9 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -39,13 +39,13 @@ - 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" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index e188a4e1e8..5ec7bf4147 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -41,13 +41,13 @@ - badges/frontend - fedmsg/base - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index eb861d4638..47f5633ee6 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -35,6 +35,7 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: # this is how you include other task lists @@ -42,7 +43,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index a9c1df742b..ac3cbbf3f8 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -37,13 +37,13 @@ - { role: bodhi/masher, epelmasher: true, when: "inventory_hostname.startswith('relepel01')" } - fedmsg/base - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 20eacddcea..3b788b3a57 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -34,6 +34,7 @@ - fas_client - collectd/base - yum-cron + - sudo tasks: # this is how you include other task lists @@ -41,7 +42,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" # we want httpd for now, to examine the product directly diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 9297e73a22..f418e5f9e1 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -58,13 +58,13 @@ - rsyncd - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index b9d1b7bfab..8e5f9e151c 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -33,13 +33,13 @@ - nagios_client - fas_client - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index a831a6485d..9debab9908 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -38,13 +38,13 @@ - nagios_client - fas_client - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 30a8d69b3e..6466058f05 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -38,13 +38,13 @@ - nagios_client - fas_client - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index dfe0977250..00e47cd7d8 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -38,13 +38,13 @@ - nagios_client - fas_client - fedmsg/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" handlers: diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index ffc807a6e1..8aaaad0361 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -39,6 +39,7 @@ - fas_client - fedmsg/base - keyserver + - sudo tasks: - include: "{{ tasks }}/hosts.yml" @@ -46,7 +47,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/openvpn_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" handlers: diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 92214c78c4..7737e3ea24 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -41,13 +41,13 @@ - { role: koji_builder, when: env == "staging" } - { role: nfs/server, when: env == "staging" } - koji_hub + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/lockbox.yml b/playbooks/groups/lockbox.yml index 758a5a1473..81e1833ebd 100644 --- a/playbooks/groups/lockbox.yml +++ b/playbooks/groups/lockbox.yml @@ -31,13 +31,13 @@ - nagios_client - fas_client - ansible-server + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index eef4750215..eb5a53419b 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -39,6 +39,7 @@ - fas_client - collectd/base - yum-cron + - sudo tasks: # this is how you include other task lists @@ -46,7 +47,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" - include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index fb80ce8010..832fadf45c 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -40,6 +40,7 @@ - fas_client - collectd/base - mirrorlist + - sudo tasks: # this is how you include other task lists @@ -48,7 +49,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/openvpn_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index cdbfe65841..652bc648ee 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -39,13 +39,13 @@ - 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" - - include: "{{ tasks }}/sudo.yml" # The proxies don't actually need to talk to these hosts so we won't bother # putting them on the vpn. #- include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index e35e623022..3540b96a0f 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -40,13 +40,13 @@ - collectd/base - fedmsg/base - notifs/frontend + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 30c0edf31b..8f41fc025a 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -38,13 +38,13 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 3b6b6d51aa..603a662f23 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -39,13 +39,13 @@ - fas_client - collectd/base - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index efc4854a25..329e1b406a 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -36,13 +36,13 @@ - collectd/base - paste - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 9f12223d14..4a9c9ae3dc 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -38,13 +38,13 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml index a80469c040..ff32883bbd 100644 --- a/playbooks/groups/postgresl-server.yml +++ b/playbooks/groups/postgresl-server.yml @@ -41,13 +41,13 @@ - postgresql_server - collectd/base - collectd/postgres # This requires a 'databases' var to be set in host_vars + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" # TODO: add iscsi task diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 3cd8f48359..b38226b2ef 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -38,6 +38,7 @@ - { role: fas_client, tags:['fas_client'] } - { role: collectd/base, tags:['collectd_base'] } - { role: yum-cron, tags:['yumcron'] } + - { role: sudo, tags:['sudo'] } - { role: taskotron/resultsdb-backend, tags: ['resultsdb-be'] } - { role: taskotron/resultsdb-frontend, tags: ['resultsdb-fe'] } @@ -47,7 +48,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 8950d5a4b9..6c5ecddfd4 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -34,13 +34,13 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" handlers: diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 76dcb162e4..f08a2105ac 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -38,13 +38,13 @@ - nagios_client - collectd/base - fas_client + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" # The proxies don't actually need to talk to these hosts so we won't bother # putting them on the vpn. #- include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 972a7e2298..79b85ae654 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -49,13 +49,13 @@ - rsyncd - mirrormanager/frontend - freemedia + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" - include: "{{ tasks }}/openvpn_client.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index f886101cd9..d5e72be729 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -40,13 +40,13 @@ - fas_client - collectd/base - rsyncd + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index a749e654aa..ca235999db 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -37,6 +37,7 @@ - fas_client - collectd/base - yum-cron + - sudo tasks: # this is how you include other task lists @@ -44,7 +45,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index b9b166fc5c..bc55abb76d 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -35,13 +35,13 @@ - fas_client - collectd/base - unbound + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" handlers: diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 92e5d7ae96..561024c2ea 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -37,13 +37,13 @@ - fedmsg/base - fedmsg/irc - supybot + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 7ae0c560ec..384deabfa8 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -21,13 +21,13 @@ - 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" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/openvpn_client.yml" when: datacenter != 'phx2' - include: "{{ tasks }}/virthost.yml" diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 5be804464b..475ef5dc3d 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -42,13 +42,13 @@ - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } - mediawiki + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/openvpn_client.yml" when: env != "staging" diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index ade4387040..90e9c12ca3 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -22,13 +22,15 @@ vars: - mailman_vardir: /srv/persist/mailman + roles: + - sudo + 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 }}/sudo.yml" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml index 07d59fed40..88791012ee 100644 --- a/playbooks/manual/kernel-qa.yml +++ b/playbooks/manual/kernel-qa.yml @@ -18,6 +18,7 @@ - denyhosts - nagios_client - fas_client + - sudo tasks: # this is how you include other task lists @@ -25,7 +26,6 @@ - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: diff --git a/playbooks/manual/monitor.yml b/playbooks/manual/monitor.yml index 55ab4c083f..85c6f2117c 100644 --- a/playbooks/manual/monitor.yml +++ b/playbooks/manual/monitor.yml @@ -37,13 +37,13 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index 60f0922f4f..cdf14e71e2 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -37,13 +37,13 @@ - nagios_client - fas_client - collectd/base + - sudo tasks: - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/sudo.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/tasks/sudo.yml b/roles/sudo/tasks/main.yml similarity index 100% rename from tasks/sudo.yml rename to roles/sudo/tasks/main.yml