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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Stephen Smoogen 2017-04-07 15:06:11 +00:00
commit 61fe776735
4 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/copr/backend/tasks/main.yml
View file

@ -196,9 +196,11 @@
- copr-backend - copr-backend
- copy: src="cleanup_vm_nova.py" dest=/home/copr/ mode=755 - copy: src="cleanup_vm_nova.py" dest=/home/copr/ mode=755
- copy: src="cleanup_vms.sh" dest=/etc/cron.hourly/copr_cleanup_vms.sh mode=755
- copy: src="cron/restart_logstash.sh" dest=/etc/cron.hourly/restart_logstash.sh mode=755 - copy: src="cron/restart_logstash.sh" dest=/etc/cron.hourly/restart_logstash.sh mode=755
- copy: src="cleanup_vms.sh" dest=/etc/cron.hourly/copr_cleanup_vms.sh mode=755
when: not devel
#- name: copy delete-forgotten-instances.pl #- name: copy delete-forgotten-instances.pl
# copy: src="delete-forgotten-instances.pl" dest=/home/copr/delete-forgotten-instances.pl mode=755 # copy: src="delete-forgotten-instances.pl" dest=/home/copr/delete-forgotten-instances.pl mode=755

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

@ -283,11 +283,14 @@ listen openqa 0.0.0.0:10044
listen pdc 0.0.0.0:10045 listen pdc 0.0.0.0:10045
balance hdr(appserver) balance hdr(appserver)
## pdc-web01 is commented out because we don't currently know how to configure {% if env == "staging" %}
server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2
{% else %}
## pdc-web01 is absent because we don't currently know how to configure
## mod_auth_mellon to work when distributed across more than one app node. It ## mod_auth_mellon to work when distributed across more than one app node. It
## expects to be able to share some state between requests in-process. Boo. ## expects to be able to share some state between requests in-process. Boo.
#server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2
server pdc-web02 pdc-web02:80 check inter 10s rise 1 fall 2 server pdc-web02 pdc-web02:80 check inter 10s rise 1 fall 2
{% endif %}
option httpchk GET /rest_api/v1/ option httpchk GET /rest_api/v1/
timeout server 3600000 timeout server 3600000
timeout connect 3600000 timeout connect 3600000

2
roles/koji_builder/tasks/main.yml
View file

@ -238,7 +238,7 @@
- name: set kernel params for more loops - name: set kernel params for more loops
command: /sbin/grubby --update-kernel=ALL --args=max_loop=64 command: /sbin/grubby --update-kernel=ALL --args=max_loop=64
when: max_loop is defined and max_loop.stdout.find("max_loop=64") == -1 when: max_loop is defined
tags: tags:
- koji_builder - koji_builder

12
roles/mirrormanager/backend/templates/create_statistics.sh
View file

@ -19,20 +19,22 @@ else
fi fi
INFILE=${INPUT}-${DATE}.xz INFILE=${INPUT}-${DATE}.xz
INFILE_CONTAINER1=${CONTAINER1}-${DATE}.xz
INFILE_CONTAINER2=${CONTAINER2}-${DATE}.xz
OUTPUT=`mktemp -d` OUTPUT=`mktemp -d`
#trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT trap "rm -f ${OUTPUT}/*; rmdir ${OUTPUT}" QUIT TERM INT HUP EXIT
# Fetch compressed log files # Fetch compressed log files
for s in ${MIRRORLIST_SERVERS}; do for s in ${MIRRORLIST_SERVERS}; do
ssh $s "( xzcat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( xzcat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
done done
for s in ${MIRRORLIST_PROXIES}; do for s in ${MIRRORLIST_PROXIES}; do
ssh $s "( xzcat $INFILE_CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( cat $CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( xzcat $INFILE_CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz ssh $s "( cat $CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
if [ "$1" == "yesterday" ]; then
ssh $s "( xzcat $CONTAINER1-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
ssh $s "( xzcat $CONTAINER2-${DATE}.xz | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz
fi
done done
${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/ ${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/