From 28790ecebefa9457e052ab87b11bc79bc33a9529 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 11 May 2018 19:12:44 +0000 Subject: [PATCH] finish cleanup of old bodhi frontend web vms --- .../host_vars/bodhi03.phx2.fedoraproject.org | 49 ------------------ .../host_vars/bodhi04.phx2.fedoraproject.org | 11 ---- inventory/inventory | 1 - master.yml | 1 - playbooks/groups/bodhi2.yml | 51 ------------------- 5 files changed, 113 deletions(-) delete mode 100644 inventory/host_vars/bodhi03.phx2.fedoraproject.org delete mode 100644 inventory/host_vars/bodhi04.phx2.fedoraproject.org delete mode 100644 playbooks/groups/bodhi2.yml diff --git a/inventory/host_vars/bodhi03.phx2.fedoraproject.org b/inventory/host_vars/bodhi03.phx2.fedoraproject.org deleted file mode 100644 index a0afc45b95..0000000000 --- a/inventory/host_vars/bodhi03.phx2.fedoraproject.org +++ /dev/null @@ -1,49 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ -volgroup: /dev/vg_virthost01 -eth0_ip: 10.5.126.115 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 -max_mem_size: 16384 - -fedmsg_certs: -- service: shell - owner: root - group: sysadmin - can_send: - - logger.log -- service: bodhi - owner: root - group: bodhi - can_send: - - bodhi.buildroot_override.tag - - bodhi.buildroot_override.untag - - bodhi.stack.delete - - bodhi.stack.save - - bodhi.update.comment - - bodhi.update.complete.testing - - bodhi.update.edit - - bodhi.update.karma.threshold.reach - - bodhi.update.request.obsolete - - bodhi.update.request.revoke - - bodhi.update.request.stable - - bodhi.update.request.testing - - bodhi.update.request.batched - - bodhi.update.request.unpush - - # Things that only the mash does - not the web UI - #- bodhi.mashtask.complete - #- bodhi.mashtask.mashing - #- bodhi.mashtask.start - #- bodhi.mashtask.sync.done - #- bodhi.mashtask.sync.wait - #- bodhi.errata.publish - #- bodhi.update.eject - - # Rsync messages that get run from somewhere else entirely. - #- bodhi.updates.epel.sync - #- bodhi.updates.fedora.sync diff --git a/inventory/host_vars/bodhi04.phx2.fedoraproject.org b/inventory/host_vars/bodhi04.phx2.fedoraproject.org deleted file mode 100644 index 843366304a..0000000000 --- a/inventory/host_vars/bodhi04.phx2.fedoraproject.org +++ /dev/null @@ -1,11 +0,0 @@ ---- -nm: 255.255.255.0 -gw: 10.5.126.254 -dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27 -ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.116 -vmhost: virthost02.phx2.fedoraproject.org -datacenter: phx2 -max_mem_size: 16384 diff --git a/inventory/inventory b/inventory/inventory index fd5e40eb67..8908ebc180 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -1437,7 +1437,6 @@ librariesio2fedmsg-stg [bodhi2] bodhi-web-temp-bodhi.app.os.fedoraproject.org -bodhi03.phx2.fedoraproject.org [bodhi2-stg] bodhi-web-temp-bodhi.app.os.stg.fedoraproject.org diff --git a/master.yml b/master.yml index bf0a102b94..096b075b62 100644 --- a/master.yml +++ b/master.yml @@ -25,7 +25,6 @@ - import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml -- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml - import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml deleted file mode 100644 index 5516a5aa5e..0000000000 --- a/playbooks/groups/bodhi2.yml +++ /dev/null @@ -1,51 +0,0 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi2:bodhi2-stg" - -- name: make the box be real - hosts: bodhi2:bodhi2-stg - 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: - - base - - rkhunter - - nagios_client - - hosts - - fas_client - - sudo - - collectd/base - - rsyncd - - { role: openvpn/client, - when: env != "staging" } - - apache - - mod_wsgi - - - { role: bodhi2/base, when: "inventory_hostname.startswith('bodhi0')" } - - { role: fedmsg/base, when: "inventory_hostname.startswith('bodhi0')" } - - - role: keytab/service - owner_user: bodhi - owner_group: bodhi - service: bodhi - host: "bodhi.fedoraproject.org" - when: env == "production" - - role: keytab/service - owner_user: bodhi - owner_group: bodhi - service: bodhi - host: "bodhi.stg.fedoraproject.org" - when: env == "staging" - - tasks: - - import_tasks: "{{ tasks_path }}/2fa_client.yml" - - import_tasks: "{{ tasks_path }}/motd.yml" - - handlers: - - import_tasks: "{{ handlers_path }}/restart_services.yml"