Take out releng04/relepel01/bodhi01/bodhi02.

This commit is contained in:
Kevin Fenzi 2015-08-21 19:17:59 +00:00
parent a6155e2b72
commit 237a7113fd
12 changed files with 21 additions and 237 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -80,17 +80,10 @@ blockerbugs02.phx2.fedoraproject.org
[blockerbugs-stg] [blockerbugs-stg]
blockerbugs01.stg.phx2.fedoraproject.org blockerbugs01.stg.phx2.fedoraproject.org
[bodhi]
bodhi01.phx2.fedoraproject.org
bodhi02.phx2.fedoraproject.org
[bodhi2] [bodhi2]
bodhi03.phx2.fedoraproject.org bodhi03.phx2.fedoraproject.org
bodhi04.phx2.fedoraproject.org bodhi04.phx2.fedoraproject.org
[bodhi-stg]
bodhi01.stg.phx2.fedoraproject.org
[bodhi2-stg] [bodhi2-stg]
bodhi02.stg.phx2.fedoraproject.org bodhi02.stg.phx2.fedoraproject.org
@ -182,10 +175,6 @@ mailman01.stg.phx2.fedoraproject.org
[collab] [collab]
collab03.fedoraproject.org collab03.fedoraproject.org
[releng]
releng04.phx2.fedoraproject.org
relepel01.phx2.fedoraproject.org
[bodhi-backend] [bodhi-backend]
bodhi-backend01.phx2.fedoraproject.org bodhi-backend01.phx2.fedoraproject.org
# We really only need one bodhi-backend node for now. As things stand now, they # 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-backend01.stg.phx2.fedoraproject.org
badges-web01.stg.phx2.fedoraproject.org badges-web01.stg.phx2.fedoraproject.org
blockerbugs01.stg.phx2.fedoraproject.org blockerbugs01.stg.phx2.fedoraproject.org
bodhi01.stg.phx2.fedoraproject.org
bodhi02.stg.phx2.fedoraproject.org bodhi02.stg.phx2.fedoraproject.org
bodhi-backend01.stg.phx2.fedoraproject.org bodhi-backend01.stg.phx2.fedoraproject.org
bugzilla2fedmsg01.stg.phx2.fedoraproject.org bugzilla2fedmsg01.stg.phx2.fedoraproject.org

View file

@ -27,7 +27,6 @@
#- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml #- 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/beaker-virthosts.yml
- include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.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/bodhi2.yml
- include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml - include: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
- include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml - include: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml

View file

@ -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"

View file

@ -67,9 +67,9 @@ syncHttpLogs elections01.stg.phx2.fedoraproject.org
syncHttpLogs tagger01.phx2.fedoraproject.org syncHttpLogs tagger01.phx2.fedoraproject.org
syncHttpLogs tagger02.phx2.fedoraproject.org syncHttpLogs tagger02.phx2.fedoraproject.org
syncHttpLogs tagger01.stg.phx2.fedoraproject.org syncHttpLogs tagger01.stg.phx2.fedoraproject.org
syncHttpLogs bodhi01.phx2.fedoraproject.org syncHttpLogs bodhi03.phx2.fedoraproject.org
syncHttpLogs bodhi02.phx2.fedoraproject.org syncHttpLogs bodhi04.phx2.fedoraproject.org
syncHttpLogs bodhi01.stg.phx2.fedoraproject.org syncHttpLogs bodhi02.stg.phx2.fedoraproject.org
syncHttpLogs packages03.phx2.fedoraproject.org syncHttpLogs packages03.phx2.fedoraproject.org
syncHttpLogs packages04.phx2.fedoraproject.org syncHttpLogs packages04.phx2.fedoraproject.org
syncHttpLogs packages03.stg.phx2.fedoraproject.org syncHttpLogs packages03.stg.phx2.fedoraproject.org

View file

@ -67,10 +67,10 @@ listen mirrormanager 0.0.0.0:10008
server mm-frontend01 mm-frontend01:80 check inter 60s rise 2 fall 3 server mm-frontend01 mm-frontend01:80 check inter 60s rise 2 fall 3
option httpchk GET /mirrormanager/static/mirrormanager2.css option httpchk GET /mirrormanager/static/mirrormanager2.css
listen bodhi 0.0.0.0:10009 #listen bodhi 0.0.0.0:10009
balance hdr(appserver) # balance hdr(appserver)
server bodhi01 bodhi01:80 check inter 20s rise 2 fall 3 # server bodhi01 bodhi01:80 check inter 20s rise 2 fall 3
option httpchk GET /updates/nagios # option httpchk GET /updates/nagios
listen bodhi2 0.0.0.0:10010 listen bodhi2 0.0.0.0:10010
balance hdr(appserver) balance hdr(appserver)

View file

@ -1,7 +1,7 @@
define host { #define host {
host_name bodhi01 # host_name bodhi01
alias bodhi01.phx2.fedoraproject.org # alias bodhi01.phx2.fedoraproject.org
use defaulttemplate # use defaulttemplate
address bodhi01.phx2.fedoraproject.org # address bodhi01.phx2.fedoraproject.org
parents virthost01 # parents virthost01
} #}

View file

@ -1,7 +1,7 @@
define host { #define host {
host_name bodhi02 # host_name bodhi02
alias bodhi02.phx2.fedoraproject.org # alias bodhi02.phx2.fedoraproject.org
use defaulttemplate # use defaulttemplate
address bodhi02.phx2.fedoraproject.org # address bodhi02.phx2.fedoraproject.org
parents virthost03 # parents virthost03
} #}