From 237a7113fdfb4dc215eb1e55e5df9c763200428a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 21 Aug 2015 19:17:59 +0000 Subject: [PATCH] Take out releng04/relepel01/bodhi01/bodhi02. --- inventory/group_vars/bodhi | 61 ------------------ inventory/group_vars/bodhi-stg | 62 ------------------- .../host_vars/bodhi01.phx2.fedoraproject.org | 10 --- .../bodhi01.stg.phx2.fedoraproject.org | 10 --- .../host_vars/bodhi02.phx2.fedoraproject.org | 10 --- inventory/inventory | 12 ---- master.yml | 1 - playbooks/groups/bodhi.yml | 50 --------------- roles/base/files/syncHttpLogs.sh | 6 +- roles/haproxy/templates/haproxy.cfg.stg | 8 +-- .../files/nagios/hosts/bodhi01.cfg | 14 ++--- .../files/nagios/hosts/bodhi02.cfg | 14 ++--- 12 files changed, 21 insertions(+), 237 deletions(-) delete mode 100644 inventory/group_vars/bodhi delete mode 100644 inventory/group_vars/bodhi-stg delete mode 100644 inventory/host_vars/bodhi01.phx2.fedoraproject.org delete mode 100644 inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org delete mode 100644 inventory/host_vars/bodhi02.phx2.fedoraproject.org delete mode 100644 playbooks/groups/bodhi.yml diff --git a/inventory/group_vars/bodhi b/inventory/group_vars/bodhi deleted file mode 100644 index f533c83190..0000000000 --- a/inventory/group_vars/bodhi +++ /dev/null @@ -1,61 +0,0 @@ ---- -# Define resources for this group of hosts here. -jobrunner: false -epelmasher: false - -lvm_size: 40000 -mem_size: 4096 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file - -# Definining these vars has a number of effects -# 1) mod_wsgi is configured to use the vars for its own setup -# 2) iptables opens enough ports for all threads for fedmsg -# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads -wsgi_fedmsg_service: bodhi -wsgi_procs: 4 -wsgi_threads: 1 - -tcp_ports: [ 80 ] - -# Neeed for rsync from log01 for logs. -custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] - -fas_client_groups: sysadmin-noc - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin -- 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 - - bodhi.update.request.obsolete - - bodhi.update.request.revoke - - bodhi.update.request.stable - - bodhi.update.request.testing - - 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/group_vars/bodhi-stg b/inventory/group_vars/bodhi-stg deleted file mode 100644 index 7809f37164..0000000000 --- a/inventory/group_vars/bodhi-stg +++ /dev/null @@ -1,62 +0,0 @@ ---- -# Define resources for this group of hosts here. -jobrunner: false -epelmasher: false - -lvm_size: 40000 -mem_size: 4096 -num_cpus: 2 - -# for systems that do not match the above - specify the same parameter in -# the host_vars/$hostname file - -# Definining these vars has a number of effects -# 1) mod_wsgi is configured to use the vars for its own setup -# 2) iptables opens enough ports for all threads for fedmsg -# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads -wsgi_fedmsg_service: bodhi -wsgi_procs: 4 -wsgi_threads: 1 - -tcp_ports: [ 80 ] - -# Neeed for rsync from log01 for logs. -custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] - -fas_client_groups: sysadmin-noc - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: sysadmin -- 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 - - bodhi.update.request.obsolete - - bodhi.update.request.revoke - - bodhi.update.request.stable - - bodhi.update.request.testing - - 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/bodhi01.phx2.fedoraproject.org b/inventory/host_vars/bodhi01.phx2.fedoraproject.org deleted file mode 100644 index 44886f2969..0000000000 --- a/inventory/host_vars/bodhi01.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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-rhel-6 -ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_virthost01 -eth0_ip: 10.5.126.110 -vmhost: virthost01.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org deleted file mode 100644 index 0c22cb5f31..0000000000 --- a/inventory/host_vars/bodhi01.stg.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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-rhel-6 -ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_guests -eth0_ip: 10.5.126.166 -vmhost: virthost10.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/host_vars/bodhi02.phx2.fedoraproject.org b/inventory/host_vars/bodhi02.phx2.fedoraproject.org deleted file mode 100644 index 4b965f5dee..0000000000 --- a/inventory/host_vars/bodhi02.phx2.fedoraproject.org +++ /dev/null @@ -1,10 +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-rhel-6 -ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/ -volgroup: /dev/vg_virthost03 -eth0_ip: 10.5.126.165 -vmhost: virthost03.phx2.fedoraproject.org -datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index 1a90cc5473..affdc6c24b 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -80,17 +80,10 @@ blockerbugs02.phx2.fedoraproject.org [blockerbugs-stg] blockerbugs01.stg.phx2.fedoraproject.org -[bodhi] -bodhi01.phx2.fedoraproject.org -bodhi02.phx2.fedoraproject.org - [bodhi2] bodhi03.phx2.fedoraproject.org bodhi04.phx2.fedoraproject.org -[bodhi-stg] -bodhi01.stg.phx2.fedoraproject.org - [bodhi2-stg] bodhi02.stg.phx2.fedoraproject.org @@ -182,10 +175,6 @@ mailman01.stg.phx2.fedoraproject.org [collab] collab03.fedoraproject.org -[releng] -releng04.phx2.fedoraproject.org -relepel01.phx2.fedoraproject.org - [bodhi-backend] bodhi-backend01.phx2.fedoraproject.org # We really only need one bodhi-backend node for now. As things stand now, they @@ -535,7 +524,6 @@ ask01.stg.phx2.fedoraproject.org badges-backend01.stg.phx2.fedoraproject.org badges-web01.stg.phx2.fedoraproject.org blockerbugs01.stg.phx2.fedoraproject.org -bodhi01.stg.phx2.fedoraproject.org bodhi02.stg.phx2.fedoraproject.org bodhi-backend01.stg.phx2.fedoraproject.org bugzilla2fedmsg01.stg.phx2.fedoraproject.org diff --git a/master.yml b/master.yml index b19adbc040..7ba2c1cd66 100644 --- a/master.yml +++ b/master.yml @@ -27,7 +27,6 @@ #- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml - include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml - include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml -- include: /srv/web/infra/ansible/playbooks/groups/bodhi.yml - include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml - include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml - include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml deleted file mode 100644 index bec5ceb4d0..0000000000 --- a/playbooks/groups/bodhi.yml +++ /dev/null @@ -1,50 +0,0 @@ -- name: make bodhi - hosts: bodhi:bodhi-stg #machines: bodhi01, bodhi02, releng04, relepel01 - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - -- name: make the box be real - hosts: bodhi:bodhi-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 - - roles: - - base - - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - - nagios_client - - hosts - - fas_client - - collectd/base - - { role: bodhi/base, when: "inventory_hostname.startswith('bodhi01') or inventory_hostname.startswith('bodhi02.phx2')" } - - { role: fedmsg/base, when: "inventory_hostname.startswith('bodhi01') or inventory_hostname.startswith('bodhi02.phx2')" } - - rsyncd - - sudo - - { role: openvpn/client, - when: env != "staging" } - - apache - - tasks: - - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 83d6749c06..6deb78b3dc 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -67,9 +67,9 @@ syncHttpLogs elections01.stg.phx2.fedoraproject.org syncHttpLogs tagger01.phx2.fedoraproject.org syncHttpLogs tagger02.phx2.fedoraproject.org syncHttpLogs tagger01.stg.phx2.fedoraproject.org -syncHttpLogs bodhi01.phx2.fedoraproject.org -syncHttpLogs bodhi02.phx2.fedoraproject.org -syncHttpLogs bodhi01.stg.phx2.fedoraproject.org +syncHttpLogs bodhi03.phx2.fedoraproject.org +syncHttpLogs bodhi04.phx2.fedoraproject.org +syncHttpLogs bodhi02.stg.phx2.fedoraproject.org syncHttpLogs packages03.phx2.fedoraproject.org syncHttpLogs packages04.phx2.fedoraproject.org syncHttpLogs packages03.stg.phx2.fedoraproject.org diff --git a/roles/haproxy/templates/haproxy.cfg.stg b/roles/haproxy/templates/haproxy.cfg.stg index 4c4023be7d..4f3b823faa 100644 --- a/roles/haproxy/templates/haproxy.cfg.stg +++ b/roles/haproxy/templates/haproxy.cfg.stg @@ -67,10 +67,10 @@ listen mirrormanager 0.0.0.0:10008 server mm-frontend01 mm-frontend01:80 check inter 60s rise 2 fall 3 option httpchk GET /mirrormanager/static/mirrormanager2.css -listen bodhi 0.0.0.0:10009 - balance hdr(appserver) - server bodhi01 bodhi01:80 check inter 20s rise 2 fall 3 - option httpchk GET /updates/nagios +#listen bodhi 0.0.0.0:10009 +# balance hdr(appserver) +# server bodhi01 bodhi01:80 check inter 20s rise 2 fall 3 +# option httpchk GET /updates/nagios listen bodhi2 0.0.0.0:10010 balance hdr(appserver) diff --git a/roles/nagios_server/files/nagios/hosts/bodhi01.cfg b/roles/nagios_server/files/nagios/hosts/bodhi01.cfg index 44a9bdfeb8..64315b2e62 100644 --- a/roles/nagios_server/files/nagios/hosts/bodhi01.cfg +++ b/roles/nagios_server/files/nagios/hosts/bodhi01.cfg @@ -1,7 +1,7 @@ -define host { - host_name bodhi01 - alias bodhi01.phx2.fedoraproject.org - use defaulttemplate - address bodhi01.phx2.fedoraproject.org - parents virthost01 -} +#define host { +# host_name bodhi01 +# alias bodhi01.phx2.fedoraproject.org +# use defaulttemplate +# address bodhi01.phx2.fedoraproject.org +# parents virthost01 +#} diff --git a/roles/nagios_server/files/nagios/hosts/bodhi02.cfg b/roles/nagios_server/files/nagios/hosts/bodhi02.cfg index f1273093ad..52364d047b 100644 --- a/roles/nagios_server/files/nagios/hosts/bodhi02.cfg +++ b/roles/nagios_server/files/nagios/hosts/bodhi02.cfg @@ -1,7 +1,7 @@ -define host { - host_name bodhi02 - alias bodhi02.phx2.fedoraproject.org - use defaulttemplate - address bodhi02.phx2.fedoraproject.org - parents virthost03 -} +#define host { +# host_name bodhi02 +# alias bodhi02.phx2.fedoraproject.org +# use defaulttemplate +# address bodhi02.phx2.fedoraproject.org +# parents virthost03 +#}