From 8c2d3b5a9d912b7dba1aa4914cb9f3b1ce3f3a10 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Apr 2017 01:54:59 +0000 Subject: [PATCH 1/4] this now fails when undefined --- roles/koji_builder/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 1116796770..604df86141 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -238,7 +238,7 @@ - name: set kernel params for more loops 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: - koji_builder From 6dd2d7a2bc50aed34dbad3398cbfa08ce76245ca Mon Sep 17 00:00:00 2001 From: clime Date: Fri, 7 Apr 2017 09:21:18 +0200 Subject: [PATCH 2/4] copr-backend: employ cleanup_vm_nova only on production machine --- roles/copr/backend/tasks/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index c139164312..c3f825bb5b 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -196,9 +196,11 @@ - copr-backend - 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="cleanup_vms.sh" dest=/etc/cron.hourly/copr_cleanup_vms.sh mode=755 + when: not devel + #- name: copy delete-forgotten-instances.pl # copy: src="delete-forgotten-instances.pl" dest=/home/copr/delete-forgotten-instances.pl mode=755 From 0b2e306561cbff12ae95ed128c5ad6a91047735e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Fri, 7 Apr 2017 12:16:14 +0000 Subject: [PATCH 3/4] mirrormanager: adapt statistics script to new logfiles Signed-off-by: Adrian Reber --- .../backend/templates/create_statistics.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/roles/mirrormanager/backend/templates/create_statistics.sh b/roles/mirrormanager/backend/templates/create_statistics.sh index 456ac3103d..16ff660167 100644 --- a/roles/mirrormanager/backend/templates/create_statistics.sh +++ b/roles/mirrormanager/backend/templates/create_statistics.sh @@ -19,20 +19,22 @@ else fi INFILE=${INPUT}-${DATE}.xz -INFILE_CONTAINER1=${CONTAINER1}-${DATE}.xz -INFILE_CONTAINER2=${CONTAINER2}-${DATE}.xz 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 for s in ${MIRRORLIST_SERVERS}; do ssh $s "( xzcat $INFILE | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz done for s in ${MIRRORLIST_PROXIES}; do - ssh $s "( xzcat $INFILE_CONTAINER1 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz - ssh $s "( xzcat $INFILE_CONTAINER2 | gzip -4 )" >> ${OUTPUT}/mirrorlist.log.gz + ssh $s "( cat $CONTAINER1 | 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 ${STATISTICS} -l ${OUTPUT}/mirrorlist.log.gz -d ${OUTPUT}/ From abdc3271d57cf19ee4b2669acc3bc8cc70357101 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 7 Apr 2017 12:47:00 +0000 Subject: [PATCH 4/4] Re-enable pdc-web01 in staging only. --- roles/haproxy/templates/haproxy.cfg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index 496f9e7992..cc0a1aa181 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -283,11 +283,14 @@ listen openqa 0.0.0.0:10044 listen pdc 0.0.0.0:10045 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 ## 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 +{% endif %} option httpchk GET /rest_api/v1/ timeout server 3600000 timeout connect 3600000