Merge branch 'master' of /git/ansible

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
 

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

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
 

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}/