infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

kill paste0* instances

Browse source
This commit is contained in:
Kevin Fenzi 2017-04-11 19:42:45 +00:00
parent 96774f04f5
commit 31254f9775
12 changed files with 28 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

17
inventory/group_vars/paste
View file

@ -1,17 +0,0 @@
---
# Define resources for this group of hosts here.
lvm_size: 20000
mem_size: 2048
num_cpus: 2
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
virt_install_command: "{{ virt_install_command_rhel6 }}"
tcp_ports: [ 80, 443, 8888 ]
# 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,sysadmin-paste,fi-apprentice,sysadmin-veteran
# This host doesn't freeze
freezes: false

17
inventory/group_vars/paste-stg
View file

@ -1,17 +0,0 @@
---
# Define resources for this group of hosts here.
lvm_size: 20000
mem_size: 2048
num_cpus: 2
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
virt_install_command: "{{ virt_install_command_rhel6 }}"
tcp_ports: [ 80, 443, 8888 ]
# 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,sysadmin-paste,fi-apprentice,sysadmin-veteran
# This host doesn't freeze
freezes: false

10
inventory/host_vars/paste01.phx2.fedoraproject.org
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_guests00
eth0_ip: 10.5.126.59
vmhost: virthost15.phx2.fedoraproject.org
datacenter: phx2

10
inventory/host_vars/paste01.stg.phx2.fedoraproject.org
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.61
vmhost: virthost11.phx2.fedoraproject.org
datacenter: phx2

10
inventory/host_vars/paste02.phx2.fedoraproject.org
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_virthost
eth0_ip: 10.5.126.17
vmhost: virthost18.phx2.fedoraproject.org
datacenter: phx2

8
inventory/inventory
View file

@ -596,13 +596,6 @@ packages04.phx2.fedoraproject.org
[packages-stg] [packages-stg]
packages03.stg.phx2.fedoraproject.org packages03.stg.phx2.fedoraproject.org
[paste]
paste01.phx2.fedoraproject.org
paste02.phx2.fedoraproject.org
[paste-stg]
paste01.stg.phx2.fedoraproject.org
[pkgdb] [pkgdb]
pkgdb01.phx2.fedoraproject.org pkgdb01.phx2.fedoraproject.org
pkgdb02.phx2.fedoraproject.org pkgdb02.phx2.fedoraproject.org
@ -755,7 +748,6 @@ notifs-web02.stg.phx2.fedoraproject.org
nuancier01.stg.phx2.fedoraproject.org nuancier01.stg.phx2.fedoraproject.org
nuancier02.stg.phx2.fedoraproject.org nuancier02.stg.phx2.fedoraproject.org
packages03.stg.phx2.fedoraproject.org packages03.stg.phx2.fedoraproject.org
paste01.stg.phx2.fedoraproject.org
pdc-backend01.stg.phx2.fedoraproject.org pdc-backend01.stg.phx2.fedoraproject.org
pdc-backend02.stg.phx2.fedoraproject.org pdc-backend02.stg.phx2.fedoraproject.org
pdc-web01.stg.phx2.fedoraproject.org pdc-web01.stg.phx2.fedoraproject.org

2
master.yml
View file

@ -133,7 +133,7 @@
- include: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/eclipse.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fas2-dev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fas3-dev.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml #- include: /srv/web/infra/ansible/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/faitout.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml
- include: /srv/web/infra/ansible/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml - include: /srv/web/infra/ansible/playbooks/hosts/fedimg-dev.fedorainfracloud.org.yml

3
roles/base/files/syncHttpLogs.sh
View file

@ -50,9 +50,6 @@ syncHttpLogs fas01.stg.phx2.fedoraproject.org
syncHttpLogs fedocal01.phx2.fedoraproject.org syncHttpLogs fedocal01.phx2.fedoraproject.org
syncHttpLogs fedocal02.phx2.fedoraproject.org syncHttpLogs fedocal02.phx2.fedoraproject.org
syncHttpLogs fedocal01.stg.phx2.fedoraproject.org syncHttpLogs fedocal01.stg.phx2.fedoraproject.org
syncHttpLogs paste01.phx2.fedoraproject.org
syncHttpLogs paste02.phx2.fedoraproject.org
syncHttpLogs paste01.stg.phx2.fedoraproject.org
syncHttpLogs datagrepper01.phx2.fedoraproject.org syncHttpLogs datagrepper01.phx2.fedoraproject.org
syncHttpLogs datagrepper02.phx2.fedoraproject.org syncHttpLogs datagrepper02.phx2.fedoraproject.org
syncHttpLogs datagrepper01.stg.phx2.fedoraproject.org syncHttpLogs datagrepper01.stg.phx2.fedoraproject.org

8
roles/haproxy/templates/haproxy.cfg
View file

@ -194,14 +194,6 @@ listen fedocal 0.0.0.0:10023
# IMPORTANT: 10023-10026 will NOT work because of selinux policies # IMPORTANT: 10023-10026 will NOT work because of selinux policies
listen paste 0.0.0.0:10027
balance hdr(appserver)
server paste01 paste01:80 check inter 10s rise 1 fall 2
{% if env == "production" %}
server paste02 paste02:80 check inter 10s rise 1 fall 2
{% endif %}
option httpchk GET /
listen datagrepper 0.0.0.0:10028 listen datagrepper 0.0.0.0:10028
balance hdr(appserver) balance hdr(appserver)
server datagrepper01 datagrepper01:80 check inter 10s rise 1 fall 2 server datagrepper01 datagrepper01:80 check inter 10s rise 1 fall 2

14
roles/nagios/server/files/nagios/hosts/paste01.cfg
View file

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

14
roles/nagios/server/files/nagios/hosts/paste02.cfg
View file

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

26
roles/nagios/server/files/nagios/services/websites.cfg
View file

@ -277,19 +277,19 @@ define service {
use websitetemplate use websitetemplate
} }
define service { #define service {
host_name paste01 # host_name paste01
service_description Pastebin webapp on paste01 # service_description Pastebin webapp on paste01
check_command check_website!paste01.phx2.fedoraproject.org!/!Archives # check_command check_website!paste01.phx2.fedoraproject.org!/!Archives
use websitetemplate # use websitetemplate
} #}
#
define service { #define service {
host_name paste02 # host_name paste02
service_description Pastebin webapp on paste02 # service_description Pastebin webapp on paste02
check_command check_website!paste02.phx2.fedoraproject.org!/!Archives # check_command check_website!paste02.phx2.fedoraproject.org!/!Archives
use websitetemplate # use websitetemplate
} #}
define service { define service {
host_name modernpaste01 host_name modernpaste01