diff --git a/master.yml b/master.yml index ee08ce6e67..db61d0410f 100644 --- a/master.yml +++ b/master.yml @@ -82,8 +82,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/tang.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml deleted file mode 100644 index f58c6ad521..0000000000 --- a/playbooks/groups/taskotron-client-hosts.yml +++ /dev/null @@ -1,73 +0,0 @@ -# create a new taskotron client host server system -# NOTE: should be used with --limit most of the time -# NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -# This has an extra role that configures the virthost to be used with beaker for -# virtual machine clients - -- name: basic configuration - hosts: taskotron_dev_client_hosts:taskotron_stg_client_hosts:taskotron_prod_client_hosts - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - pre_tasks: - - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - roles: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - collectd/base - - sudo - - { role: openvpn/client, when: datacenter != "phx2" } - - tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -#- name: configure taskotron imagefactory -# hosts: qa11.qa.fedoraproject.org:qa12.qa.fedoraproject.org -# user: root -# gather_facts: True -# -# vars_files: -# - /srv/web/infra/ansible/vars/global.yml -# - "/srv/private/ansible/vars.yml" -# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml -# -# roles: -# - { role: taskotron/imagefactory, tags: ['taskotronimagefactory'] } -# -# handlers: -# - import_tasks: "{{ handlers_path }}/restart_services.yml" -# -#- name: configure taskotron client host -# hosts: taskotron_dev_client_hosts:taskotron_stg_client_hosts:taskotron_prod_client_hosts -# user: root -# gather_facts: True -# -# vars_files: -# - /srv/web/infra/ansible/vars/global.yml -# - "/srv/private/ansible/vars.yml" -# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml -# -# roles: -# - { role: taskotron/taskotron-client, tags: ['taskotronclient'] } -# - { role: taskotron/imagefactory-client, tags: ['imagefactoryclient']} -# - { role: taskotron/buildslave, tags: ['buildslave'] } -# - { role: taskotron/buildslave-configure, tags: ['buildslaveconfigure'] } -# -# handlers: -# - import_tasks: "{{ handlers_path }}/restart_services.yml" -# -# diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml deleted file mode 100644 index 62acc7fea1..0000000000 --- a/playbooks/groups/taskotron.yml +++ /dev/null @@ -1,85 +0,0 @@ ---- -# create a new taskotron server -# NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars - -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron_dev:taskotron_stg:taskotron_prod" - -- name: make the box be real - hosts: taskotron_dev:taskotron_stg:taskotron_prod - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - pre_tasks: - - import_tasks: "{{ tasks_path }}/yumrepos.yml" - - roles: - - { role: base, tags: ['base'] } - - { role: rkhunter, tags: ['rkhunter'] } - - { role: nagios_client, tags: ['nagios_client'] } - - { role: hosts, tags: ['hosts']} - - { role: fas_client, tags: ['fas_client'] } - - { role: collectd/base, tags: ['collectd_base'] } - - { role: dnf-automatic, tags: ['dnfautomatic'] } - - { role: sudo, tags: ['sudo'] } - - { role: openvpn/client, - when: deployment_type == "prod", tags: ['openvpn_client'] } - - apache - - { role: fedmsg/base } - - tasks: - # this is how you include other task lists - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" - -# taskotron systems are in the process of being decomissioned -#- name: configure taskotron master -# hosts: taskotron_dev:taskotron_stg:taskotron_prod -# user: root -# gather_facts: True -# -# vars_files: -# - /srv/web/infra/ansible/vars/global.yml -# - "/srv/private/ansible/vars.yml" -# - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml -# -# roles: -# - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_dev', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,sec=sys', when: deployment_type == 'dev' } -# - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,sec=sys', when: deployment_type == 'stg' } -# - { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3,sec=sys', when: deployment_type == 'prod' } -# - { role: taskotron/grokmirror, tags: ['grokmirror'] } -## - { role: taskotron/cgit, tags: ['cgit'] } -# - { role: taskotron/buildmaster, tags: ['buildmaster'] } -# - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] } -# - { role: taskotron/taskotron-trigger, tags: ['trigger'] } -# - { role: taskotron/taskotron-frontend, tags: ['frontend'] } -# - { role: taskotron/taskotron-master, tags: ['taskotronmaster'] } -# -# handlers: -# - import_tasks: "{{ handlers_path }}/restart_services.yml" -# -- name: configure standalone taskotron host - hosts: taskotron_dev - user: root - gather_facts: True - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - roles: - - { role: taskotron/taskotron-proxy, tags: ['taskotronproxy'] } - - { role: taskotron/ssl-taskotron, tags: ['ssltaskotron'] } - - { role: letsencrypt, site_name: 'taskotron-dev.fedoraproject.org' } - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/update_grokmirror_repos.yml b/playbooks/update_grokmirror_repos.yml deleted file mode 100644 index b41b67ff25..0000000000 --- a/playbooks/update_grokmirror_repos.yml +++ /dev/null @@ -1,12 +0,0 @@ -# update all mirrors currently served by grokmirror - -- name: update grokmirror repos - hosts: taskotron-dev:taskotron-stg:taskotron-prod - become: true - become_user: "{{ grokmirror_user }}" - gather_facts: false - - tasks: - - name: update grokmirror repos - command: chdir={{ grokmirror_basedir }}/{{ item.name }} git fetch origin {{ grokmirror_default_branch }}:{{ grokmirror_default_branch }} - with_items: "{{ grokmirror_repos }}"