Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Switch from people03 to people01.

Browse source 
Switch backups
Change fasClient runs to run on people01 instead of people03.
Change sync logs to get from people01
Change nagios to monitor people01 instead of people03
Change quota limits some to work better.
Enable planet cron jobs on people01.
This commit is contained in:
Kevin Fenzi 2015-07-08 21:08:47 +00:00
parent 2b3967274f
commit 68bcc9bff7
9 changed files with 51 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/backups
View file

@ -11,7 +11,7 @@ hosted04.fedoraproject.org
hosted-lists01.fedoraproject.org
lockbox01.phx2.fedoraproject.org
pagure01.fedoraproject.org
people03.fedoraproject.org
people01.fedoraproject.org
pkgs02.phx2.fedoraproject.org
log01.phx2.fedoraproject.org
qadevel.cloud.fedoraproject.org

2
playbooks/run_fasClient.yml
View file

@ -14,7 +14,7 @@
when: inventory_hostname_short.startswith('bastion0')
- name: run fasClient on people and hosted and pkgs first as these are the ones most people want updated
hosts: people03.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org
hosts: people01.fedoraproject.org:pkgs02.phx2.fedoraproject.org:hosted03.fedoraproject.org
user: root
gather_facts: False

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

@ -82,7 +82,7 @@ syncHttpLogs value01.phx2.fedoraproject.org
syncHttpLogs secondary01
syncHttpLogs hosted03.vpn.fedoraproject.org old
syncHttpLogs hosted04.vpn.fedoraproject.org old
syncHttpLogs people03.vpn.fedoraproject.org old
syncHttpLogs people01.vpn.fedoraproject.org old
syncHttpLogs noc01.phx2.fedoraproject.org
syncHttpLogs download01.phx2.fedoraproject.org
syncHttpLogs download02.phx2.fedoraproject.org

12
roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg
View file

@ -1,8 +1,8 @@
define host {
host_name 152.19.134.191-people03
alias 152.19.134.191-people03
host_name 152.19.134.196-people01
alias 152.19.134.196-people01
use defaulttemplate
address 152.19.134.191
address 152.19.134.196
parents ibiblio03.fedoraproject.org
}
@ -14,8 +14,8 @@ define host {
}
define host {
host_name ipv6-people03
alias ipv6-people03
host_name ipv6-people01
alias ipv6-people01
use defaulttemplate
address 2610:28:3090:3001:5054:ff:fedb:7f5a
address 2610:28:3090:3001:5054:ff:feff:683f
}

2
roles/nagios_server/files/nagios-external/services/websites.cfg
View file

@ -169,7 +169,7 @@ define service {
}
define service {
host_name 152.19.134.191-people03
host_name 152.19.134.196-people01
service_description planet
check_command check_website!planet.fedoraproject.org!/!Sub-Project planets
use websitetemplate

7
roles/nagios_server/files/nagios/hosts/people01.cfg Normal file
View file

@ -0,0 +1,7 @@
define host {
host_name people01
alias people01.fedoraproject.org
use defaulttemplate
address people01.fedoraproject.org
parents ibiblio03
}

14
roles/nagios_server/files/nagios/hosts/people03.cfg
View file

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

6
roles/people/tasks/main.yml
View file

@ -94,7 +94,7 @@
- name: set quotas for people who have more set
command: xfs_quota -x -c 'limit bsoft={{ item.quota }} bhard={{ item.quota }} {{ item.user }}' /srv
with_items:
- { user: apache, quota: 0 }
- { user: apache, quota: 1000g }
- { user: dmarlin, quota: 5g }
- { user: duffy, quota: 10g }
- { user: dwalsh, quota: 5g }
@ -103,10 +103,10 @@
- { user: kashyapc, quota: 5g }
- { user: lupinix, quota: 8g }
- { user: mimccune, quota: 3g }
- { user: nobody, quota: 0 }
- { user: nobody, quota: 1000g }
- { user: npmccallum, quota: 5g }
- { user: parasense, quota: 5g }
- { user: planet-user, quota: 0 }
- { user: planet-user, quota: 1000g }
- { user: ppisar, quota: 4g }
- { user: pulpadmin, quota: 10g }
- { user: sapnetweavergatewayonfedora, quota: 5g }

48
roles/planet/tasks/main.yml
View file

@ -71,10 +71,10 @@
tags:
- planet_server
#- name: copy the planet cron job (people)
# copy: src=planet-cron dest=/etc/cron.d/planet-cron
# tags:
# - planet_server
- name: copy the planet cron job (people)
copy: src=planet-cron dest=/etc/cron.d/planet-cron
tags:
- planet_server
#
# design
@ -88,10 +88,10 @@
- /srv/planet/config/design/cache
- /srv/planet/site/design
#- name: copy the planet cron job (design)
# copy: src=sub-planets/design/planet-group.cron dest=/etc/cron.d/planet-design.cron
# tags:
# - planet_server
- name: copy the planet cron job (design)
copy: src=sub-planets/design/planet-group.cron dest=/etc/cron.d/planet-design.cron
tags:
- planet_server
- name: copy the planet fpbulder.conf (design)
copy: src=sub-planets/design/fpbuilder.conf dest=/etc/planet/design/fpbuilder.conf
@ -129,10 +129,10 @@
- /srv/planet/config/desktop/cache
- /srv/planet/site/desktop
#- name: copy the planet cron job (desktop)
# copy: src=sub-planets/desktop/planet-group.cron dest=/etc/cron.d/planet-desktop.cron
# tags:
# - planet_server
- name: copy the planet cron job (desktop)
copy: src=sub-planets/desktop/planet-group.cron dest=/etc/cron.d/planet-desktop.cron
tags:
- planet_server
- name: copy the planet fpbulder.conf (desktop)
copy: src=sub-planets/desktop/fpbuilder.conf dest=/etc/planet/desktop/fpbuilder.conf
@ -171,10 +171,10 @@
- /srv/planet/config/edited/cache
- /srv/planet/site/edited
#- name: copy the planet cron job (edited)
# copy: src=sub-planets/edited/planet-group.cron dest=/etc/cron.d/planet-edited.cron
# tags:
# - planet_server
- name: copy the planet cron job (edited)
copy: src=sub-planets/edited/planet-group.cron dest=/etc/cron.d/planet-edited.cron
tags:
- planet_server
- name: copy the planet fpbulder.conf (edited)
copy: src=sub-planets/edited/fpbuilder.conf dest=/etc/planet/edited/fpbuilder.conf
@ -245,10 +245,10 @@
- /srv/planet/config/security/cache
- /srv/planet/site/security
#- name: copy the planet cron job (security)
# copy: src=sub-planets/security/planet-group.cron dest=/etc/cron.d/planet-security.cron
# tags:
# - planet_server
- name: copy the planet cron job (security)
copy: src=sub-planets/security/planet-group.cron dest=/etc/cron.d/planet-security.cron
tags:
- planet_server
- name: copy the planet fpbulder.conf (security)
copy: src=sub-planets/security/fpbuilder.conf dest=/etc/planet/security/fpbuilder.conf
@ -287,10 +287,10 @@
- /srv/planet/config/summer-coding/cache
- /srv/planet/site/summer-coding
#- name: copy the planet cron job (summer-coding)
# copy: src=sub-planets/summer-coding/planet-group.cron dest=/etc/cron.d/planet-summer-coding.cron
# tags:
# - planet_server
- name: copy the planet cron job (summer-coding)
copy: src=sub-planets/summer-coding/planet-group.cron dest=/etc/cron.d/planet-summer-coding.cron
tags:
- planet_server
- name: copy the planet fpbulder.conf (summer-coding)
copy: src=sub-planets/summer-coding/fpbuilder.conf dest=/etc/planet/summer-coding/fpbuilder.conf