From 68bcc9bff7d713ef83164ffa885cf2013ab91269 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 8 Jul 2015 21:08:47 +0000 Subject: [PATCH] Switch from people03 to people01. 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. --- inventory/backups | 2 +- playbooks/run_fasClient.yml | 2 +- roles/base/files/syncHttpLogs.sh | 2 +- .../hosts/fedorapeople.org.cfg | 12 ++--- .../nagios-external/services/websites.cfg | 2 +- .../files/nagios/hosts/people01.cfg | 7 +++ .../files/nagios/hosts/people03.cfg | 14 +++--- roles/people/tasks/main.yml | 6 +-- roles/planet/tasks/main.yml | 48 +++++++++---------- 9 files changed, 51 insertions(+), 44 deletions(-) create mode 100644 roles/nagios_server/files/nagios/hosts/people01.cfg diff --git a/inventory/backups b/inventory/backups index bc3fc05757..bd8b8aadc8 100644 --- a/inventory/backups +++ b/inventory/backups @@ -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 diff --git a/playbooks/run_fasClient.yml b/playbooks/run_fasClient.yml index da855ee669..3c35ff56b5 100644 --- a/playbooks/run_fasClient.yml +++ b/playbooks/run_fasClient.yml @@ -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 diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh index 684b2bd2e4..67f6cdfa1b 100644 --- a/roles/base/files/syncHttpLogs.sh +++ b/roles/base/files/syncHttpLogs.sh @@ -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 diff --git a/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg b/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg index 85c2320cfc..9e48874383 100644 --- a/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg +++ b/roles/nagios_server/files/nagios-external/hosts/fedorapeople.org.cfg @@ -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 } diff --git a/roles/nagios_server/files/nagios-external/services/websites.cfg b/roles/nagios_server/files/nagios-external/services/websites.cfg index 0787e533f4..e5592b2234 100644 --- a/roles/nagios_server/files/nagios-external/services/websites.cfg +++ b/roles/nagios_server/files/nagios-external/services/websites.cfg @@ -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 diff --git a/roles/nagios_server/files/nagios/hosts/people01.cfg b/roles/nagios_server/files/nagios/hosts/people01.cfg new file mode 100644 index 0000000000..c864407cc0 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/people01.cfg @@ -0,0 +1,7 @@ +define host { + host_name people01 + alias people01.fedoraproject.org + use defaulttemplate + address people01.fedoraproject.org + parents ibiblio03 +} diff --git a/roles/nagios_server/files/nagios/hosts/people03.cfg b/roles/nagios_server/files/nagios/hosts/people03.cfg index fa8a869ce4..cb5a36da25 100644 --- a/roles/nagios_server/files/nagios/hosts/people03.cfg +++ b/roles/nagios_server/files/nagios/hosts/people03.cfg @@ -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 +#} diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml index 7011d98249..c8e0be40bb 100644 --- a/roles/people/tasks/main.yml +++ b/roles/people/tasks/main.yml @@ -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 } diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml index 951fa9aa6d..02ebfc913c 100644 --- a/roles/planet/tasks/main.yml +++ b/roles/planet/tasks/main.yml @@ -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