diff --git a/playbooks/check-for-nonvirt-updates.yml b/playbooks/check-for-nonvirt-updates.yml
index 679264ef24..bf59009b4f 100644
--- a/playbooks/check-for-nonvirt-updates.yml
+++ b/playbooks/check-for-nonvirt-updates.yml
@@ -1,11 +1,11 @@
 #
-# simple playbook to check all hosts and see how many updates they have pending. 
+# simple playbook to check all hosts and see how many updates they have pending.
 # It could be a lot faster if we didn't gather facts, but we need that for yum vs dnf checking
 #
 # If you want a pretty sorted list, you need to post process the output here with something
-# like: 
+# like:
 #
-# time ansible-playbook check-for-updates.yml | grep msg\": | awk -F: '{print $2}' | sort 
+# time ansible-playbook check-for-updates.yml | grep msg\": | awk -F: '{print $2}' | sort
 #
 
 - name: check for updates
@@ -18,12 +18,12 @@
   - name: check for updates (yum)
     yum: list=updates update_cache=true
     register: yumoutput
-    when: ansible_distribution_major_version|int < 22 and ansible_virtualization_role == 'host' 
+    when: ansible_distribution_major_version|int < 22 and ansible_virtualization_role == 'host'
 
   - name: check for updates (dnf)
     dnf: list=updates
     register: dnfoutput
-    when: ansible_distribution_major_version|int > 21 and ansible_virtualization_role == 'host' 
+    when: ansible_distribution_major_version|int > 21 and ansible_virtualization_role == 'host'
 
   - debug: msg="{{ inventory_hostname}} {{ yumoutput.results|length }}"
     when: yumoutput is defined and yumoutput.results|length > 0
diff --git a/playbooks/check-for-updates.yml b/playbooks/check-for-updates.yml
index 8c80765fa7..ec828497de 100644
--- a/playbooks/check-for-updates.yml
+++ b/playbooks/check-for-updates.yml
@@ -1,11 +1,11 @@
 #
-# simple playbook to check all hosts and see how many updates they have pending. 
+# simple playbook to check all hosts and see how many updates they have pending.
 # It could be a lot faster if we didn't gather facts, but we need that for yum vs dnf checking
 #
 # If you want a pretty sorted list, you need to post process the output here with something
-# like: 
+# like:
 #
-# time ansible-playbook check-for-updates.yml | grep msg\": | awk -F: '{print $2}' | sort 
+# time ansible-playbook check-for-updates.yml | grep msg\": | awk -F: '{print $2}' | sort
 #
 
 - name: check for updates
diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml
index 7379e189e9..2a277c4642 100644
--- a/playbooks/check-host.yml
+++ b/playbooks/check-host.yml
@@ -77,7 +77,7 @@
       - check
       - services
 
-  - name: output loaded inactive service list systemctl 
+  - name: output loaded inactive service list systemctl
     shell: echo {{loaded_inactive_services_systemctl.stdout_lines}} >> {{temp_dir.stdout}}/liservices
     when: loaded_inactive_services_systemctl is defined and loaded_inactive_services_systemctl.rc == 0
     changed_when: False
@@ -181,7 +181,7 @@
       - check
       - selinux
 
-  - name: Show Boot SELinux mode 
+  - name: Show Boot SELinux mode
     shell: echo "SELinux boots to {{ ansible_selinux.config_mode }} mode " >> {{temp_dir.stdout}}/selinux
     when: ansible_selinux.status != "disabled"
     changed_when: False
@@ -246,7 +246,7 @@
     changed_when: False
     register: file_diff
     when: last_dir is defined and last_dir.stdout != ""
-    
+
   - name: display diff
     debug: var=file_diff.stdout_lines
     ignore_errors: True
@@ -263,7 +263,7 @@
     file: path={{localchanges.stdout}} state=absent
     changed_when: False
 
-   
+
 #  handlers:
 #  - include: "{{ handlers }}/restart_services.yml"
 #  - include: "restart_services.yml"
diff --git a/playbooks/cloud_prep.yml b/playbooks/cloud_prep.yml
index e592087852..744e5ab397 100644
--- a/playbooks/cloud_prep.yml
+++ b/playbooks/cloud_prep.yml
@@ -1,11 +1,11 @@
 # restricted to run on cloud instances only
 - hosts: 209.132.184.*
   user: root
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-  
+
   tasks:
   - include: "{{ tasks }}/cloud_setup_basic.yml"
 
diff --git a/playbooks/death_to_postfix.yml b/playbooks/death_to_postfix.yml
index 46a1f33c1a..bdf3579303 100644
--- a/playbooks/death_to_postfix.yml
+++ b/playbooks/death_to_postfix.yml
@@ -9,13 +9,13 @@
   tasks:
       - name: Try to stop postfix cleanly.
         service:  name=postfix state=stopped
-     
+
       # This doesn't really remove the pid file.. but we say it does so ansible only runs it if the pid file is there..
       - name: Really kill postfix master process
         command:  pkill -u root master removes=/var/spool/postfix/pid/master.pid
-     
+
       - name: Clean up old pid lock file.
         command: rm /var/spool/postfix/pid/master.pid removes=/var/spool/postfix/pid/master.pid
-     
+
       - name: Try to start postfix cleanly
         service:  name=postfix state=started
diff --git a/playbooks/destroy_cloud_inst.yml b/playbooks/destroy_cloud_inst.yml
index 91e5b97a86..fc1cec723a 100644
--- a/playbooks/destroy_cloud_inst.yml
+++ b/playbooks/destroy_cloud_inst.yml
@@ -16,7 +16,7 @@
 
   - name: pause for 30s before doing it
     pause: seconds=30 prompt="Destroying vm now {{ target }}, abort if this is wrong"
-    
+
   - name: find the instance id from the builder
     command: curl -s http://169.254.169.254/latest/meta-data/instance-id
     register: instanceid
diff --git a/playbooks/destroy_virt_inst.yml b/playbooks/destroy_virt_inst.yml
index 096876f9bf..432bc6ad6b 100644
--- a/playbooks/destroy_virt_inst.yml
+++ b/playbooks/destroy_virt_inst.yml
@@ -26,7 +26,7 @@
 
   - name: pause for 30s before doing it
     pause: seconds=30 prompt="Destroying (and lvremove for) vm now {{ target }}, abort if this is wrong"
-    
+
   - name: destroy the vm
     virt: name={{ inventory_hostname }} command=destroy
     delegate_to: "{{ vmhost }}"
diff --git a/playbooks/fix_arm_soc.yml b/playbooks/fix_arm_soc.yml
index 4992ab5d80..05cad4e555 100644
--- a/playbooks/fix_arm_soc.yml
+++ b/playbooks/fix_arm_soc.yml
@@ -1,6 +1,6 @@
 #
 # This playbook power cycles an arm soc, sets time and runs playbook on it.
-# 
+#
 # requires -e "target=arm0N-builderXX.arm.fedoraproject.org" -l arm0N-builderXX.arm.fedoraproject.org
 
 - name: power cycle instance
diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml
index 1729d1bc3a..4c4dd45b11 100644
--- a/playbooks/groups/autosign.yml
+++ b/playbooks/groups/autosign.yml
@@ -1,6 +1,6 @@
 # create a new autosign server
 #
-# This server looks for rawhide builds and requests they be signed. 
+# This server looks for rawhide builds and requests they be signed.
 #
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign"
 
@@ -9,7 +9,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml
index 7bcb1d0353..6097fc970e 100644
--- a/playbooks/groups/backup-server.yml
+++ b/playbooks/groups/backup-server.yml
@@ -8,7 +8,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml
index 4da9c3e8f6..a9002f9146 100644
--- a/playbooks/groups/badges-backend.yml
+++ b/playbooks/groups/badges-backend.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -46,7 +46,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml
index 2bf307d526..02639fd7d4 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/batcave.yml b/playbooks/groups/batcave.yml
index 9badfc600b..847bea6757 100644
--- a/playbooks/groups/batcave.yml
+++ b/playbooks/groups/batcave.yml
@@ -32,7 +32,7 @@
 
   - { role: nfs/client, mnt_dir: '/srv/web/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
   - { role: nfs/client, mnt_dir: '/mnt/fedora/app',  nfs_src_dir: 'fedora_app/app' }
-  
+
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml
index 98168ad3cc..49054a11c2 100644
--- a/playbooks/groups/beaker-virthosts.yml
+++ b/playbooks/groups/beaker-virthosts.yml
@@ -9,7 +9,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml
index b824f15ff5..67a8ea55a3 100644
--- a/playbooks/groups/beaker.yml
+++ b/playbooks/groups/beaker.yml
@@ -9,7 +9,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml
index 9a39f538e4..48d0474f13 100644
--- a/playbooks/groups/blockerbugs.yml
+++ b/playbooks/groups/blockerbugs.yml
@@ -9,7 +9,7 @@
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
- 
+
   roles:
   - base
   - hosts
diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 47a7f86878..1c44900d11 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -1,13 +1,13 @@
 # create a new bodhi-backend system
 #
 # This group makes bodhi-backend servers.
-# They are used by releng to push updates with bodhi. 
+# They are used by releng to push updates with bodhi.
 # They also run some misc releng scripts.
 #
 
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg"
 
-# Once the instance exists, configure it. 
+# Once the instance exists, configure it.
 
 - name: make bodhi-backend server system
   hosts: bodhi-backend:bodhi-backend-stg
diff --git a/playbooks/groups/bugyou.yml b/playbooks/groups/bugyou.yml
index c8bf2460f7..8a9da36a83 100644
--- a/playbooks/groups/bugyou.yml
+++ b/playbooks/groups/bugyou.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -37,7 +37,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -60,7 +60,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml
index 6b1e17b682..28d88ebdc8 100644
--- a/playbooks/groups/bugzilla2fedmsg.yml
+++ b/playbooks/groups/bugzilla2fedmsg.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -43,7 +43,7 @@
   - role: collectd/fedmsg-service
     process: moksha-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index 0b6652221d..4a16bb4a03 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -49,7 +49,7 @@
     process: fedmsg-gateway
   - role: collectd/fedmsg-activation
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml
index 65b352f5d1..daf61a4cb0 100644
--- a/playbooks/groups/darkserver-backend.yml
+++ b/playbooks/groups/darkserver-backend.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -14,7 +14,7 @@
 
   - yum: name=libsemanage-python state=present
   - name: "Set SElinux booleans"
-    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes 
+    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes
 
   roles:
   - base
@@ -42,7 +42,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -58,7 +58,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml
index 24c3cff870..baf1c10559 100644
--- a/playbooks/groups/darkserver-web.yml
+++ b/playbooks/groups/darkserver-web.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -14,7 +14,7 @@
 
   - yum: name=libsemanage-python state=present
   - name: "Set SElinux booleans"
-    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes 
+    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes
 
   roles:
   - base
diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml
index 9e9ad5116d..5d8c1c1c9f 100644
--- a/playbooks/groups/darkserver.yml
+++ b/playbooks/groups/darkserver.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -13,10 +13,10 @@
   pre_tasks:
 
   - name: "Add koji to hosts file"
-    lineinfile: dest=/etc/hosts line="10.5.125.36	koji koji.fedoraproject.org" state=present  
+    lineinfile: dest=/etc/hosts line="10.5.125.36	koji koji.fedoraproject.org" state=present
   - yum: name=libsemanage-python state=present
   - name: "Set SElinux booleans"
-    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes 
+    seboolean: name=httpd_can_network_connect_db state=yes persistent=yes
 
   roles:
   - base
@@ -31,7 +31,7 @@
   - role: apache
 
   - darkserver
- 
+
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml
index 8e7e5666d1..405081236a 100644
--- a/playbooks/groups/datagrepper.yml
+++ b/playbooks/groups/datagrepper.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml
index 6aec808a07..d232a6fe6b 100644
--- a/playbooks/groups/dns.yml
+++ b/playbooks/groups/dns.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index 7ee97291c1..ccc0007e0b 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -62,10 +62,10 @@
   - name: install bc so last-sync works.
     yum: pkg=bc state=present
     when: inventory_hostname == 'download-ib01.fedoraproject.org'
-    
 
 
-    
+
+
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
 
diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml
index 0fad0c07f4..98f4ded9ff 100644
--- a/playbooks/groups/fas.yml
+++ b/playbooks/groups/fas.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/fas3.yml b/playbooks/groups/fas3.yml
index a00fbdacd7..224f003957 100644
--- a/playbooks/groups/fas3.yml
+++ b/playbooks/groups/fas3.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml
index 11ec71714c..9e166ad196 100644
--- a/playbooks/groups/fedimg.yml
+++ b/playbooks/groups/fedimg.yml
@@ -8,7 +8,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -55,7 +55,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml
index 13ba0acc48..300e8b66cb 100644
--- a/playbooks/groups/fedocal.yml
+++ b/playbooks/groups/fedocal.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -36,7 +36,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml
index 937d5d7407..7805e9a3da 100644
--- a/playbooks/groups/gallery.yml
+++ b/playbooks/groups/gallery.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml
index 7bab6e67b9..c6b950e14d 100644
--- a/playbooks/groups/github2fedmsg.yml
+++ b/playbooks/groups/github2fedmsg.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml
index 0ccfadbd93..892544a96d 100644
--- a/playbooks/groups/hotness.yml
+++ b/playbooks/groups/hotness.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -63,7 +63,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml
index 8ebfcf0493..e1ba0d7e0c 100644
--- a/playbooks/groups/ipa.yml
+++ b/playbooks/groups/ipa.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml
index d2b3d47782..840afce4ca 100644
--- a/playbooks/groups/ipsilon.yml
+++ b/playbooks/groups/ipsilon.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml
index 1de72c986f..989a04538d 100644
--- a/playbooks/groups/keyserver.yml
+++ b/playbooks/groups/keyserver.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -26,7 +26,7 @@
   - { role: openvpn/client,
       when: env != "staging" }
   - apache
-  - keyserver  
+  - keyserver
 
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml
index 58a6651efd..f728361170 100644
--- a/playbooks/groups/logserver.yml
+++ b/playbooks/groups/logserver.yml
@@ -31,7 +31,7 @@
 
 #
 # We exclude some dirs from restorecon on updates on logservers as they are very large
-# and it takes a long long time to run restorecon over them. 
+# and it takes a long long time to run restorecon over them.
 #
   - name: exclude some directories from selinux relabeling on updates
     copy: src="{{ files }}/logserver/fixfiles_exclude_dirs" dest=/etc/selinux/fixfiles_exclude_dirs owner=root mode=0644
diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml
index ee038e073e..942287bbea 100644
--- a/playbooks/groups/mariadb-server.yml
+++ b/playbooks/groups/mariadb-server.yml
@@ -4,14 +4,14 @@
 
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org"
 
-# Once the instance exists, configure it. 
+# Once the instance exists, configure it.
 
 - name: configure mariadb server system
   hosts: db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml
index 5301add63c..9129b057d0 100644
--- a/playbooks/groups/mdapi.yml
+++ b/playbooks/groups/mdapi.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -53,7 +53,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - "{{ vars_path }}/{{ ansible_distribution }}.yml"
diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml
index 66ad9101e3..df09e0bf6e 100644
--- a/playbooks/groups/mirrorlist2.yml
+++ b/playbooks/groups/mirrorlist2.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml
index 3b7cfc1c28..fd7a4fce3a 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -36,7 +36,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml
index eaafe3e210..75cb7d4a20 100644
--- a/playbooks/groups/notifs-backend.yml
+++ b/playbooks/groups/notifs-backend.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -60,7 +60,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml
index cdc1297de4..b89473711e 100644
--- a/playbooks/groups/notifs-web.yml
+++ b/playbooks/groups/notifs-web.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml
index 06ff236131..9acd2f6e5c 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -1,6 +1,6 @@
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg"
 
-- name: setup base openqa host 
+- name: setup base openqa host
   hosts: openqa:openqa-stg
   user: root
   gather_facts: True
diff --git a/playbooks/groups/openstack-compute-nodes.yml b/playbooks/groups/openstack-compute-nodes.yml
index af154f695f..70f8376da7 100644
--- a/playbooks/groups/openstack-compute-nodes.yml
+++ b/playbooks/groups/openstack-compute-nodes.yml
@@ -4,7 +4,7 @@
   hosts: openstack-compute
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/RedHat.yml
diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index 98145f7bd1..217c623db8 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -8,7 +8,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -81,7 +81,7 @@
     SSLCertificateChainFile: wildcard-2014.fedorapeople.org.intermediate.cert
 
   - people
- 
+
   tasks:
   - include: "{{ tasks }}/yumrepos.yml"
   - include: "{{ tasks }}/2fa_client.yml"
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 0461a3881a..3b8ea4d26b 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -27,8 +27,8 @@
   - git/server
   - git/hooks
   - clamav
-  - { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4' } 
-  - { role: nfs/client, when: env == "staging", mnt_dir: '/srv/cache/lookaside_prod',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4' } 
+  - { role: nfs/client, when: env != "staging", mnt_dir: '/srv/cache/lookaside',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4' }
+  - { role: nfs/client, when: env == "staging", mnt_dir: '/srv/cache/lookaside_prod',  nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='ro,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4' }
   - role: distgit
     tags: distgit
   - { role: hosts, when: env == "staging" }
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index a3d7685b5e..6cb74febb9 100644
--- a/playbooks/groups/postgresql-server.yml
+++ b/playbooks/groups/postgresql-server.yml
@@ -4,14 +4,14 @@
 
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.qa.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org"
 
-# Once the instance exists, configure it. 
+# Once the instance exists, configure it.
 
 - name: configure postgresql server system
   hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.qa.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 600b798492..6627629e3f 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -149,7 +149,7 @@
     - reload httpd
 
   #
-  # If this is an initial deployment, make sure docs are synced over. 
+  # If this is an initial deployment, make sure docs are synced over.
   # Do not count these as changed ever
   #
   - name: make sure docs are synced. This could take a very very very logtime to finish
diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml
index 3b6fdb32c4..318146146c 100644
--- a/playbooks/groups/resultsdb-dev.yml
+++ b/playbooks/groups/resultsdb-dev.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -40,7 +40,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml
index 8d538650e0..d2fe457f22 100644
--- a/playbooks/groups/resultsdb-prod.yml
+++ b/playbooks/groups/resultsdb-prod.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml
index 4cacbbdf1f..4f8d629d42 100644
--- a/playbooks/groups/resultsdb-stg.yml
+++ b/playbooks/groups/resultsdb-stg.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -40,7 +40,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml
index f86539d4a3..e4a49a8956 100644
--- a/playbooks/groups/secondary.yml
+++ b/playbooks/groups/secondary.yml
@@ -20,11 +20,11 @@
   - download
   - rsyncd
   - sudo
-  - { role: nfs/client, 
-      mnt_dir: '/srv/pub/archive',  
+  - { role: nfs/client,
+      mnt_dir: '/srv/pub/archive',
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/archive' }
-  - { role: nfs/client, 
-      mnt_dir: '/srv/pub/alt',  
+  - { role: nfs/client,
+      mnt_dir: '/srv/pub/alt',
       nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4",
       nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/alt' }
   - { role: nfs/client,
diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml
index ac1167c897..221fa57c40 100644
--- a/playbooks/groups/sign-bridge.yml
+++ b/playbooks/groups/sign-bridge.yml
@@ -2,9 +2,9 @@
 # NOTE: this assumes the boxes are already up and are accessible
 # NOTE: most of these vars_path come from group_vars/sign or from hostvars
 #
-# FURTHER NOTE: some of These machines run day to day with sshd disabled/off. 
-# Access is via management interface only. This playbook does initial setup. 
-# Please check with rel-eng before doing anything here. 
+# FURTHER NOTE: some of These machines run day to day with sshd disabled/off.
+# Access is via management interface only. This playbook does initial setup.
+# Please check with rel-eng before doing anything here.
 
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge"
 
@@ -13,7 +13,7 @@
   user: root
   gather_facts: true
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml
index 44db4552c1..6807a5c27e 100644
--- a/playbooks/groups/smtp-mm.yml
+++ b/playbooks/groups/smtp-mm.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml
index f7404a93db..ee7a8a9f64 100644
--- a/playbooks/groups/statscache.yml
+++ b/playbooks/groups/statscache.yml
@@ -9,7 +9,7 @@
   hosts: statscache:statscache-stg
   user: root
   gather_facts: True
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -35,7 +35,7 @@
   hosts: statscache-web:statscache-web-stg
   user: root
   gather_facts: True
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -52,7 +52,7 @@
   hosts: statscache-backend:statscache-backend-stg
   user: root
   gather_facts: True
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml
index 77df8ca268..6c452cfc0b 100644
--- a/playbooks/groups/summershum.yml
+++ b/playbooks/groups/summershum.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -63,7 +63,7 @@
   - role: collectd/fedmsg-service
     process: fedmsg-hub
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index 6ba29ad57d..fe9c67e505 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -1,6 +1,6 @@
 # create a new sundries server
 #
-# These servers run a number of smaller apps that don't merit their own instances. 
+# These servers run a number of smaller apps that don't merit their own instances.
 #
 
 - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg"
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml
index db988da932..6171a793b4 100644
--- a/playbooks/groups/tagger.yml
+++ b/playbooks/groups/tagger.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -58,7 +58,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/taskotron-client-hosts.yml b/playbooks/groups/taskotron-client-hosts.yml
index 31b5d537b6..35a1560b82 100644
--- a/playbooks/groups/taskotron-client-hosts.yml
+++ b/playbooks/groups/taskotron-client-hosts.yml
@@ -9,7 +9,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -68,4 +68,4 @@
   handlers:
    - include: "{{ handlers }}/restart_services.yml"
 
- 
+
diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml
index 36b2e9b735..b8b8ea009f 100644
--- a/playbooks/groups/taskotron-dev.yml
+++ b/playbooks/groups/taskotron-dev.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -40,7 +40,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml
index aacc296115..ae3ad8ae9b 100644
--- a/playbooks/groups/taskotron.yml
+++ b/playbooks/groups/taskotron.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -42,7 +42,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -64,7 +64,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml
index 295ad85e60..92f62db959 100644
--- a/playbooks/groups/torrent.yml
+++ b/playbooks/groups/torrent.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/twisted-buildbots.yml b/playbooks/groups/twisted-buildbots.yml
index 1d626f0c02..3797497d6c 100644
--- a/playbooks/groups/twisted-buildbots.yml
+++ b/playbooks/groups/twisted-buildbots.yml
@@ -24,7 +24,7 @@
   - include: "{{ tasks }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{inventory_hostname}}"
- 
+
   tasks:
 
   - name: add twisted key
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index d54665da82..2a1d3fbbe9 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml
index 1015c8e7c8..f26d006ec7 100644
--- a/playbooks/groups/wiki.yml
+++ b/playbooks/groups/wiki.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml
index 424c6174a8..600374019f 100644
--- a/playbooks/groups/zanata2fedmsg.yml
+++ b/playbooks/groups/zanata2fedmsg.yml
@@ -10,7 +10,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -41,7 +41,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/host_update.yml b/playbooks/host_update.yml
index 2da686dc0e..05d14df90b 100644
--- a/playbooks/host_update.yml
+++ b/playbooks/host_update.yml
@@ -7,11 +7,11 @@
   hosts: "{{ target }}"
   gather_facts: false
   user: root
- 
-  tasks: 
+
+  tasks:
   - name: expire-caches
     command: yum clean expire-cache
-    
+
   - name: yum -y {{ yumcommand }}
     command: yum -y {{ yumcommand }}
     async: 7200
@@ -26,7 +26,7 @@
     command: /usr/bin/test -f /usr/bin/rkhunter
     register: rkhunter
     ignore_errors: true
-  
+
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
     when: rkhunter|success
diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml
index 14ece31de8..53c1ae6328 100644
--- a/playbooks/hosts/artboard.fedorainfracloud.org.yml
+++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml
@@ -94,7 +94,7 @@
     tags:
     - artboard
 
-  - name: make artboard subdir 
+  - name: make artboard subdir
     file: path=/srv/persist/artboard mode=0755 state=directory
     tags:
     - artboard
@@ -112,7 +112,7 @@
     notify: reload httpd
     tags:
     - artboard
-    
+
   - name: startup apache
     service: name=httpd state=started
     tags:
diff --git a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
index 1434578b2b..13716db38c 100644
--- a/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/blockerbugs-dev.cloud.fedoraproject.org.yml
@@ -3,7 +3,7 @@
   user: root
   gather_facts: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
 
@@ -19,7 +19,7 @@
    - tcp_ports: [22, 80, 443]
    - udp_ports: []
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
index 73fe45c9b4..004e6ececa 100644
--- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml
@@ -5,7 +5,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
index ed1f2a0729..45b623be4b 100644
--- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
+++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml
@@ -4,7 +4,7 @@
   hosts: data-analysis01.phx2.fedoraproject.org
   user: root
   gather_facts: True
-  
+
   vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
@@ -77,9 +77,9 @@
 
    - name: setup mysql items
      file: path=/srv/mysql state=directory mode=0770 owner=mysql group=mysql setype=mysqld_db_t
-       
+
    - name: semanage mysql tree
      command: /usr/sbin/semanage fcontext -a -t mysqld_db_t "/srv/mysql(/.*)?"
 
-     
+
 ##
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 7ee9a869d1..efc5df948d 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -101,7 +101,7 @@
       state=present
       regexp="^.*INPUT.*172\.24\.0\.10/24.*tcp.*{{ item }}.*ACCEPT"
       insertbefore="^.*INPUT.*RELATED,ESTABLISHED.*ACCEPT"
-      line="-A INPUT -s 172.24.0.10/24 -p tcp -m multiport --dports {{ item }} -m comment --comment \"added by fedora-infra ansible\" -j ACCEPT" 
+      line="-A INPUT -s 172.24.0.10/24 -p tcp -m multiport --dports {{ item }} -m comment --comment \"added by fedora-infra ansible\" -j ACCEPT"
       backup=yes
     with_items:
     - 80,443
@@ -278,7 +278,7 @@
 
   # http://docs.openstack.org/icehouse/install-guide/install/yum/content/basics-queue.html
   # https://openstack.redhat.com/Securing_services#qpid
-  #### FIXME 
+  #### FIXME
   - lineinfile: dest=/etc/rabbitmq/rabbitmq-env.conf regexp="^RABBITMQ_NODE_PORT=" state="absent"
   - service: name=rabbitmq-server state=started
 
@@ -461,7 +461,7 @@
   - ini_file: dest=/etc/cinder/api-paste.ini section="filter:authtoken" option=auth_protocol value=https
   - ini_file: dest=/etc/cinder/api-paste.ini section="filter:authtoken" option=service_host value={{ controller_publicname }}
   - ini_file: dest=/etc/cinder/api-paste.ini section="filter:authtoken" option=cafile value=/etc/pki/tls/certs/fedorainfracloud.org.digicert.pem
-  
+
   - ini_file: dest=/etc/neutron/neutron.conf section=keystone_authtoken option=auth_uri value=https://{{ controller_publicname }}:5000
   - ini_file: dest=/etc/neutron/neutron.conf section=keystone_authtoken option=auth_protocol value=https
   - ini_file: dest=/etc/neutron/neutron.conf section=keystone_authtoken option=auth_host value={{ controller_publicname }}
@@ -500,7 +500,7 @@
 
   # enable stunell to neutron
   - shell: cat /etc/pki/tls/certs/fedorainfracloud.org.pem /etc/pki/tls/certs/fedorainfracloud.org.digicert.pem /etc/pki/tls/private/fedorainfracloud.org.key > /etc/haproxy/fedorainfracloud.org.combined
-  - file: path=/etc/haproxy/fedorainfracloud.org.combined owner=haproxy mode=644 
+  - file: path=/etc/haproxy/fedorainfracloud.org.combined owner=haproxy mode=644
   - copy: src={{ files }}/fedora-cloud/haproxy.cfg dest=/etc/haproxy/haproxy.cfg mode=644 owner=root group=root
   # first OS have to free ports so haproxy can bind it, then we start OS on modified ports
   #- shell: openstack-service stop
@@ -952,7 +952,7 @@
       - { name: pythonbots, cidr: '172.25.128.1/20', gateway: '172.25.128.1' }
       - { name: qa, cidr: '172.25.112.1/20', gateway: '172.25.112.1' }
       - { name: scratch, cidr: '172.25.64.1/20', gateway: '172.25.64.1' }
-      - { name: transient, cidr: '172.25.48.1/20', gateway: '172.25.48.1' } 
+      - { name: transient, cidr: '172.25.48.1/20', gateway: '172.25.48.1' }
       - { name: openshift, cidr: '172.25.160.1/20', gateway: '172.25.160.1' }
   - name: "Connect router's interface to the TENANT-subnet"
     neutron_router_interface:
@@ -1222,7 +1222,7 @@
   - shell: source /root/keystonerc_admin && nova quota-update --instances 40 --cores 80 --ram 300000 --floating-ips 10 --security-groups 20 {{ TENANT_ID.stdout }}
 
 #
-# Note that we set manually the amount of volumes for this tenant to 20 in the web interface. 
+# Note that we set manually the amount of volumes for this tenant to 20 in the web interface.
 # nova quota-update cannot do so.
 #
   - shell: source /root/keystonerc_admin && keystone tenant-list | grep 'persistent ' | awk '{print $2}'
diff --git a/playbooks/hosts/fedora-hubs-dev.yml b/playbooks/hosts/fedora-hubs-dev.yml
index 1b2dd73de0..6a4ae427d6 100644
--- a/playbooks/hosts/fedora-hubs-dev.yml
+++ b/playbooks/hosts/fedora-hubs-dev.yml
@@ -3,7 +3,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
index d0fb1dd577..54ec995255 100644
--- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
+++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml
@@ -97,7 +97,7 @@
   gather_facts: no
   become: yes
   become_user: postgres
-  vars_files: 
+  vars_files:
   - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
@@ -123,7 +123,7 @@
 - name: setup mailman and hyperkitty
   hosts: lists-dev.fedorainfracloud.org
   gather_facts: True
-  vars_files: 
+  vars_files:
   - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
@@ -169,4 +169,4 @@
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
   - name: reload aliases
-    command: newaliases 
+    command: newaliases
diff --git a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
index af9acb337b..bfb492e619 100644
--- a/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/shogun-ca.cloud.fedoraproject.org.yml
@@ -3,7 +3,7 @@
   user: root
   gather_facts: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
 
@@ -16,7 +16,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml
index 16fbcda890..1127d889f2 100644
--- a/playbooks/include/proxies-certificates.yml
+++ b/playbooks/include/proxies-certificates.yml
@@ -14,7 +14,7 @@
   roles:
 
   - role: httpd/mod_ssl
-    
+
   - role: httpd/certificate
     name: wildcard-2014.fedoraproject.org
     SSLCertificateChainFile: wildcard-2014.fedoraproject.org.intermediate.cert
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index 5b6526d085..a7429ecdd7 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -50,7 +50,7 @@
   - role: httpd/redirectmatch
     name: codecs
     website: codecs.fedoraproject.org
-    regex: ^.*/(.*openh264.*.rpm$) 
+    regex: ^.*/(.*openh264.*.rpm$)
     target: http://ciscobinary.openh264.org/$1
 
   - role: httpd/redirectmatch
@@ -246,7 +246,7 @@
 
 #
 # When there is no prerelease we redirect the prerelease urls
-# back to the main release. 
+# back to the main release.
 # This should be disabled when there is a prerelease
 
   - role: httpd/redirectmatch
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 6990f0e418..f671d4f8b5 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -133,7 +133,7 @@
     - www.projectofedora.org
     - www.getfedora.com
     - getfedora.com
-    
+
   - role: httpd/website
     name: admin.fedoraproject.org
     server_aliases: [admin.stg.fedoraproject.org]
@@ -379,7 +379,7 @@
     - www.389tcp.org
     ssl: false
     cert_name: "{{wildcard_cert_name}}"
-    
+
   - role: httpd/website
     name: whatcanidoforfedora.org
     server_aliases:
diff --git a/playbooks/manual/kernel-qa.yml b/playbooks/manual/kernel-qa.yml
index b7b9daed4a..de300d7919 100644
--- a/playbooks/manual/kernel-qa.yml
+++ b/playbooks/manual/kernel-qa.yml
@@ -7,7 +7,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml
index 6105d36fac..087dcc59bc 100644
--- a/playbooks/manual/qadevel.yml
+++ b/playbooks/manual/qadevel.yml
@@ -1,6 +1,6 @@
 # create a new qadevel server
 #
-# This server looks for rawhide builds and requests they be signed. 
+# This server looks for rawhide builds and requests they be signed.
 #
 
 - name: make qadevel server
@@ -8,7 +8,7 @@
   user: root
   gather_facts: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -24,7 +24,7 @@
   user: root
   gather_facts: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/manual/sign-vault.yml b/playbooks/manual/sign-vault.yml
index 1f8ef8b699..647b6946f3 100644
--- a/playbooks/manual/sign-vault.yml
+++ b/playbooks/manual/sign-vault.yml
@@ -2,9 +2,9 @@
 # NOTE: this assumes the boxes are already up and are accessible
 # NOTE: most of these vars_path come from group_vars/sign or from hostvars
 #
-# FURTHER NOTE: some of These machines run day to day with sshd disabled/off. 
-# Access is via management interface only. This playbook does initial setup. 
-# Please check with rel-eng before doing anything here. 
+# FURTHER NOTE: some of These machines run day to day with sshd disabled/off.
+# Access is via management interface only. This playbook does initial setup.
+# Please check with rel-eng before doing anything here.
 
 - name: make sign-vault server vm (secondary and stg only)
   hosts: secondary-vault01.phx2.fedoraproject.org:sign-vault01.stg.phx2.fedoraproject.org
@@ -27,7 +27,7 @@
   user: root
   gather_facts: true
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/rdiff-backup.yml b/playbooks/rdiff-backup.yml
index 6c4b3aefd1..221aad4623 100644
--- a/playbooks/rdiff-backup.yml
+++ b/playbooks/rdiff-backup.yml
@@ -10,7 +10,7 @@
   serial: 10
   # host_backup_targets set in host_vars or group_vars
   # global_backup_targets can be defined in vars, group_vars/all or anywhere
-  # take the 'echo' out below for it to actually run 
+  # take the 'echo' out below for it to actually run
   # FIXME - see how this copes with timeouts
   # FIXME - storing/reporting results and output?
   # FIXME - coping with errors?
diff --git a/playbooks/rkhunter_only.yml b/playbooks/rkhunter_only.yml
index 0b14ce8d7b..63179e2fc0 100644
--- a/playbooks/rkhunter_only.yml
+++ b/playbooks/rkhunter_only.yml
@@ -9,7 +9,7 @@
     command: /usr/bin/test -f /usr/bin/rkhunter
     register: rkhunter
     ignore_errors: true
-  
+
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
     when: rkhunter|success
diff --git a/playbooks/rkhunter_update.yml b/playbooks/rkhunter_update.yml
index 2cc250bf86..e2939877d1 100644
--- a/playbooks/rkhunter_update.yml
+++ b/playbooks/rkhunter_update.yml
@@ -7,7 +7,7 @@
   tasks:
   - name: expire-caches
     command: yum clean expire-cache
-    
+
   - name: yum -y {{ yumcommand }}
     command: yum -y {{ yumcommand }}
     async: 7200
@@ -17,7 +17,7 @@
     command: /usr/bin/test -f /usr/bin/rkhunter
     register: rkhunter
     ignore_errors: true
-  
+
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
     when: rkhunter|success
diff --git a/playbooks/run_pkgdb_sync_git.yml b/playbooks/run_pkgdb_sync_git.yml
index 00522df220..955ab8d762 100644
--- a/playbooks/run_pkgdb_sync_git.yml
+++ b/playbooks/run_pkgdb_sync_git.yml
@@ -1,11 +1,11 @@
-# Run `pkgdb2branch` on 
+# Run `pkgdb2branch` on
 #
 #To update from testing, adjust as follow:
 # --extra-vars="package='pkg1:pkg2:pkg3'"
 
 
 - name: run pkgdb_sync_git_branches.py
-  hosts: pkgs01.phx2.fedoraproject.org 
+  hosts: pkgs01.phx2.fedoraproject.org
   user: root
   serial: 25
   gather_facts: False
diff --git a/playbooks/set_root_auth_keys.yml b/playbooks/set_root_auth_keys.yml
index 2fa9d17604..ee431de364 100644
--- a/playbooks/set_root_auth_keys.yml
+++ b/playbooks/set_root_auth_keys.yml
@@ -4,7 +4,7 @@
   user: root
   gather_facts: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -14,5 +14,5 @@
   tasks:
    - name: add root keys for sysadmin-main and other allowed users
      action: authorized_key user=root key={{ item }}
-     with_lines: 
+     with_lines:
      - "{{ auth_keys_from_fas}} @sysadmin-main {{ root_auth_users }}"
diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml
index ab31d0f602..51396dc01b 100644
--- a/playbooks/transient_cloud_instance.yml
+++ b/playbooks/transient_cloud_instance.yml
@@ -1,16 +1,16 @@
 #
 # setup a transient instance in the Fedora infrastructure private cloud
 #
-# This playbook is used to spin up a transient instance for someone to test something. 
-# In particular transient instances will all be terminated at least by the next 
-# maint window for the cloud, but ideally people will terminate instances they 
-# are done using. 
+# This playbook is used to spin up a transient instance for someone to test something.
+# In particular transient instances will all be terminated at least by the next
+# maint window for the cloud, but ideally people will terminate instances they
+# are done using.
 #
 # If you have an application or longer term item that should always be around
 # please use the persistent playbook instead.
 #
 # You MUST pass a name to it, ie: -e 'name=somethingdescriptive'
-# You can optionally override defaults by passing any of the following: 
+# You can optionally override defaults by passing any of the following:
 # image=imagename (default is centos70_x86_64)
 # instance_type=some instance type (default is m1.small)
 # root_auth_users='user1 user2 user3' (default is sysadmin-main group)
@@ -58,10 +58,10 @@
 - name: provision instance
   hosts: tmp_just_created
   gather_facts: True
-  environment: 
+  environment:
     ANSIBLE_HOST_KEY_CHECKING: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
diff --git a/playbooks/update-proxy-dns.yml b/playbooks/update-proxy-dns.yml
index 3797584061..dc247543f9 100644
--- a/playbooks/update-proxy-dns.yml
+++ b/playbooks/update-proxy-dns.yml
@@ -7,7 +7,7 @@
   hosts: "{{ proxies }}"
   user: root
   serial: 1
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "/srv/private/ansible/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -48,7 +48,7 @@
   - name: Push our changes back
     local_action: command git push chdir={{tmp.stdout}}
     when: nodns is not defined or not "true" in nodns
-  
+
   - name: Destroy our temporary clone of /git/dns/ in /var/tmp/dns-checkout....
     local_action: file dest={{tmp.stdout}} state=absent
     when: nodns is not defined or not "true" in nodns
diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml
index b2348fbd34..53e2b7b857 100644
--- a/playbooks/vhost_reboot.yml
+++ b/playbooks/vhost_reboot.yml
@@ -1,6 +1,6 @@
 #
-# This playbook lets you safely reboot a virthost and all it's guests. 
-# 
+# This playbook lets you safely reboot a virthost and all it's guests.
+#
 # requires --extra-vars="target=somevhost fqdn"
 # Might add nodns=true or nonagios=true to the extra vars
 
@@ -13,7 +13,7 @@
 # third play, reboot the vhost
 #     wait for vhost to come back
 
-# TODO: Figure out how to compare virt info pre and post boot. 
+# TODO: Figure out how to compare virt info pre and post boot.
 
 - name: find instances
   hosts: "{{ target }}"
diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml
index 01ceaddf51..1952ba9120 100644
--- a/playbooks/vhost_update.yml
+++ b/playbooks/vhost_update.yml
@@ -1,4 +1,4 @@
-# This playboook updates a virthost and all it's guests. 
+# This playboook updates a virthost and all it's guests.
 #
 # requires --extra-vars="target=somevhostname yumcommand=update"
 # Might add nodns=true or nonagios=true at extra-vars
diff --git a/roles/ansible-server/tasks/main.yml b/roles/ansible-server/tasks/main.yml
index 30244453f7..873a1ce99a 100644
--- a/roles/ansible-server/tasks/main.yml
+++ b/roles/ansible-server/tasks/main.yml
@@ -22,7 +22,7 @@
   - ansible-server
 #
 # TODO:
-#  cgit? 
+#  cgit?
 #  rbac-playbook?
 #  zodbot notifications?
 #
diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml
index 69b8d6994f..80565c0a43 100644
--- a/roles/apache/tasks/main.yml
+++ b/roles/apache/tasks/main.yml
@@ -29,9 +29,9 @@
   tags:
   - service
   - apache
-  
+
 # install hash randomization hotfix
-- name: hotfix - copy over new httpd init script 
+- name: hotfix - copy over new httpd init script
   copy: src="{{ files }}/hotfix/httpd/httpd.init" dest=/etc/init.d/httpd
         owner=root group=root mode=0755
   notify:
@@ -65,7 +65,7 @@
   template: src="{{ files }}/httpd/headers.conf.j2" dest=/etc/httpd/conf.d/headers.conf
   notify:
   - reload apache
-  tags: 
+  tags:
   - config
   - apache
 
@@ -73,10 +73,10 @@
   template: src="{{ files }}/httpd/apachestatus.conf" dest=/etc/httpd/conf.d/apachestatus.conf
   notify:
   - reload apache
-  tags: 
+  tags:
   - config
   - apache
-  
+
 - name: setup logrotate to our needs
   copy: src="{{ files }}/httpd/httpd.logrotate" dest=/etc/logrotate.d/httpd
   tags:
diff --git a/roles/ask/tasks/main.yml b/roles/ask/tasks/main.yml
index 3465dbc559..8124295278 100644
--- a/roles/ask/tasks/main.yml
+++ b/roles/ask/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 #
-# Setup askbot for ask.fedoraproject.org site. 
+# Setup askbot for ask.fedoraproject.org site.
 #
 - name: install needed packages
   yum: pkg={{ item }} state=present
@@ -106,7 +106,7 @@
   copy: >
     src={{ item }} dest=/etc/cron.d/{{ item }}
     owner=root group=root mode=0644
-  with_items: 
+  with_items:
   - cron-ask-send-reminders
   - cron-post-office-send-mail
   - cron-post-office-send-daily
diff --git a/roles/awstats/tasks/main.yml b/roles/awstats/tasks/main.yml
index a56c6247d3..0d915e1334 100644
--- a/roles/awstats/tasks/main.yml
+++ b/roles/awstats/tasks/main.yml
@@ -26,4 +26,4 @@
    - awstats
 
 #- name: set up http configs for awstats on dataserver
-    
+
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index bda1622198..dfcd42495d 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -61,7 +61,7 @@
   with_items:
   - "{{ ansible_interfaces }}"
   notify:
-#  - restart NetworkManager   
+#  - restart NetworkManager
   - reload NetworkManager-connections
   - apply interface-changes
   when: (virthost is not defined) and (not item.startswith('tun')) and (not item.startswith('virbr')) and (not item.startswith('vnet')) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest|success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
@@ -324,7 +324,7 @@
   - base
 
 #
-# Blacklist the cdc_ether module as we don't want it loading mgmt usb0 and spewing to logs. 
+# Blacklist the cdc_ether module as we don't want it loading mgmt usb0 and spewing to logs.
 #
 - name: Blacklist cdc_ether module
   copy: src=blacklist-cdc_ether.conf dest=/etc/modprobe.d/blacklist-cdc_ether.conf
@@ -350,7 +350,7 @@
     owner=root
     group=root
     mode=644
-  when: env == 'staging'  
+  when: env == 'staging'
   tags:
   - base
   - config
@@ -365,7 +365,7 @@
     owner=root
     group=root
     mode=644
-  when: env == 'production'  
+  when: env == 'production'
   tags:
   - base
   - config
diff --git a/roles/batcave/tasks/main.yml b/roles/batcave/tasks/main.yml
index 86cf7d240f..d92a175573 100644
--- a/roles/batcave/tasks/main.yml
+++ b/roles/batcave/tasks/main.yml
@@ -70,7 +70,7 @@
   - config
 
 
-# 
+#
 # This is our ansible master, setup ansible
 #
 
@@ -80,12 +80,12 @@
   - batcave
   - config
 
-- name: run daily logview report for ansible actions. 
+- name: run daily logview report for ansible actions.
   copy: src=logview.cron dest=/etc/cron.daily/logview.cron mode=0755
   tags:
   - batcave
   - config
- 
+
 - name: setup cron for daily ticketkey reollover
   copy: src=ticketkey.cron dest=/etc/cron.daily/ticketkey.cron mode=0755
   tags:
@@ -187,7 +187,7 @@
   - config
 
 #
-# This script checks all the virthosts and logs what guests they are running. 
+# This script checks all the virthosts and logs what guests they are running.
 #
 
 - name: install vmdiff.sh cron
@@ -286,8 +286,8 @@
   - config
 
 #
-# Setup geoip scripts. 
-# Other machines pull current geoip data from here. 
+# Setup geoip scripts.
+# Other machines pull current geoip data from here.
 #
 
 - name: Install geoip download databases script
diff --git a/roles/bugzilla2fedmsg/tasks/main.yml b/roles/bugzilla2fedmsg/tasks/main.yml
index 75f1e3c301..b86063bee9 100644
--- a/roles/bugzilla2fedmsg/tasks/main.yml
+++ b/roles/bugzilla2fedmsg/tasks/main.yml
@@ -39,7 +39,7 @@
     dest=/etc/moksha/production.ini
     owner=fedmsg
     group=fedmsg
-    mode=0640 
+    mode=0640
   notify:
   - restart moksha-hub
   tags:
diff --git a/roles/datagrepper/tasks/main.yml b/roles/datagrepper/tasks/main.yml
index 37cc8de737..da1c0312d7 100644
--- a/roles/datagrepper/tasks/main.yml
+++ b/roles/datagrepper/tasks/main.yml
@@ -41,7 +41,7 @@
   - packages
   - datagrepper
 
-- name: setting up httpd config 
+- name: setting up httpd config
   template: src=datagrepper-app.conf dest=/etc/httpd/conf.d/datagrepper.conf owner=root group=root
   notify:
   - reload httpd
diff --git a/roles/debug_env/tasks/main.yml b/roles/debug_env/tasks/main.yml
index 33dc4ebb8e..62d2efecd1 100644
--- a/roles/debug_env/tasks/main.yml
+++ b/roles/debug_env/tasks/main.yml
@@ -1,5 +1,5 @@
 #
-# This role can be added to a playbook to dump out all 
+# This role can be added to a playbook to dump out all
 # the env from ansible to see what variables and facts are.
 # Taken from https://coderwall.com/p/13lh6w
 #
diff --git a/roles/epylog/tasks/main.yml b/roles/epylog/tasks/main.yml
index 219427ddde..2e206c5da1 100644
--- a/roles/epylog/tasks/main.yml
+++ b/roles/epylog/tasks/main.yml
@@ -7,14 +7,14 @@
 
 - name: create directories needed for epylog
   file: state=directory path={{ item }} owner=root mode=755
-  with_items: 
+  with_items:
   - /var/lib/epylog/merged
   - /srv/web/epylog
   - /srv/web/epylog/merged
 
 - name: setup extra epylog modules
   copy: src={{ item }} dest=/usr/share/epylog/{{ item }}
-  with_items: 
+  with_items:
   - modules/selinux_mod.py
   - modules/rsyncd_mod.py
   - modules/sudo_mod.py
@@ -33,7 +33,7 @@
 
 - name: copy in all the epylog merged files
   copy: src=merged dest=/etc/epylog/
-  tags: 
+  tags:
   - config
 
 - name: epylog merged cron
@@ -44,7 +44,7 @@
 
 - name: epylog httpd config
   copy: src=epylog-web.conf dest=/etc/httpd/conf.d/epylog-web.conf
-  notify: 
+  notify:
   - reload httpd
   tags:
   - config
diff --git a/roles/fas3_server/tasks/main.yml b/roles/fas3_server/tasks/main.yml
index ca51bdef18..229e627781 100644
--- a/roles/fas3_server/tasks/main.yml
+++ b/roles/fas3_server/tasks/main.yml
@@ -28,11 +28,11 @@
   - fas3
 
 - name: install /etc/httpd/conf.d/accounts.conf file
-  copy: > 
-    src="accounts.conf" 
-    dest="/etc/httpd/conf.d/accounts.conf" 
-    owner=root 
-    group=root 
+  copy: >
+    src="accounts.conf"
+    dest="/etc/httpd/conf.d/accounts.conf"
+    owner=root
+    group=root
     mode=0644
   notify:
   - reload httpd
@@ -41,7 +41,7 @@
   - fas3
 
 - name: install /etc/fas/production.ini file
-  template: > 
+  template: >
     src="production.ini"
     dest="/etc/fas/production.ini"
     owner=root
diff --git a/roles/fas_client/tasks/main.yml b/roles/fas_client/tasks/main.yml
index 2e54b8ccf5..1e7e2560bf 100644
--- a/roles/fas_client/tasks/main.yml
+++ b/roles/fas_client/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 #
-# This task sets up fasClient on a machine. 
+# This task sets up fasClient on a machine.
 # It installs the fas-clients package, then the /etc/fas.conf and finally a cron job update.
 #
 
 #
-# fas-clients is in the infrastructure repo. 
+# fas-clients is in the infrastructure repo.
 # nss_db is needed to store user/group info.
 #
 - name: install package needed for fas-client (yum)
@@ -35,24 +35,24 @@
   - fas_client
 
 #
-# fasClients needs a valid /etc/fas.conf. 
-# There's vars used in this template: 
+# fasClients needs a valid /etc/fas.conf.
+# There's vars used in this template:
 #
 # fas_client_groups = "sysadmin-main"
 # fas_client_restricted_app = ""
 # fas_client_admin_app = ""
 # fas_client_ssh_groups = ""
 #
-# if desired, set them on a per host/group basis. 
+# if desired, set them on a per host/group basis.
 #
-# Currently the default template is used, but could be modified on a host basis. 
+# Currently the default template is used, but could be modified on a host basis.
 #
 - name: setup /etc/fas.conf for client use
   template: src={{ item }} dest=/etc/fas.conf owner=root mode=600
   with_first_found:
   - ../templates/{{ inventory_hostname }}.fas.conf.j2
   - ../templates/{{ ansible_hostname }}.fas.conf.j2
-  - ../templates/{{ ansible_hostname }}.fas.conf.j2 
+  - ../templates/{{ ansible_hostname }}.fas.conf.j2
   - ../templates/fas.conf.j2
   tags:
   - config
diff --git a/roles/fas_server/tasks/main.yml b/roles/fas_server/tasks/main.yml
index c8fe137bf9..21bc55d13e 100644
--- a/roles/fas_server/tasks/main.yml
+++ b/roles/fas_server/tasks/main.yml
@@ -37,11 +37,11 @@
   - fas
 
 - name: install /etc/httpd/conf.d/accounts.conf file
-  template: > 
-    src="fas-app.conf.j2" 
-    dest="/etc/httpd/conf.d/accounts.conf" 
-    owner=root 
-    group=root 
+  template: >
+    src="fas-app.conf.j2"
+    dest="/etc/httpd/conf.d/accounts.conf"
+    owner=root
+    group=root
     mode=0644
   notify:
   - reload httpd
@@ -55,9 +55,9 @@
   - config
   - fas
 
-- name: install pythonsitelib/fas/config/log.cfg 
+- name: install pythonsitelib/fas/config/log.cfg
   copy: >
-    src="fas-log.cfg"  
+    src="fas-log.cfg"
     dest="/usr/lib/python2.6/site-packages/fas/config/log.cfg"
     owner=root
     group=root
@@ -72,7 +72,7 @@
 
 - name: install /etc/fas-gpg/pubring.gpg file
   copy: >
-    src="{{ private }}/files/fas-gpg/pubring.gpg" 
+    src="{{ private }}/files/fas-gpg/pubring.gpg"
     dest="/etc/fas-gpg/pubring.gpg"
     owner=fas
     group=fas
@@ -83,7 +83,7 @@
 
 - name: install /etc/pki/fas/fedora-server-ca.cert file
   copy: >
-    src="{{ private }}/files/fedora-ca.cert" 
+    src="{{ private }}/files/fedora-ca.cert"
     dest="/etc/pki/fas/fedora-server-ca.cert"
     owner=fas
     group=fas
@@ -94,7 +94,7 @@
 
 - name: install /etc/pki/fas/fedora-upload-ca.cert file
   copy: >
-    src="{{ private }}/files/fedora-ca.cert" 
+    src="{{ private }}/files/fedora-ca.cert"
     dest="/etc/pki/fas/fedora-upload-ca.cert"
     owner=fas
     group=fas
@@ -105,8 +105,8 @@
 
 - name: install /usr/share/fas/static/fedora-server-ca.cert file
   copy: >
-    src="{{ private }}/files/fedora-ca.cert" 
-    dest="/usr/share/fas/static/fedora-server-ca.cert" 
+    src="{{ private }}/files/fedora-ca.cert"
+    dest="/usr/share/fas/static/fedora-server-ca.cert"
     owner=root
     group=root
     mode=0644
@@ -116,8 +116,8 @@
 
 - name: install /usr/share/fas/static/fedora-upload-ca.cert file
   copy: >
-    src="{{ private }}/files/fedora-ca.cert" 
-    dest="/usr/share/fas/static/fedora-upload-ca.cert" 
+    src="{{ private }}/files/fedora-ca.cert"
+    dest="/usr/share/fas/static/fedora-upload-ca.cert"
     owner=root
     group=root
     mode=0644
@@ -126,11 +126,11 @@
   - fas
 
 - name: install /etc/fas.cfg file
-  template: > 
-    src="fas.cfg.j2" 
-    dest="/etc/fas.cfg" 
-    owner=fas 
-    group=apache 
+  template: >
+    src="fas.cfg.j2"
+    dest="/etc/fas.cfg"
+    owner=fas
+    group=apache
     mode=0640
   notify:
   - reload httpd
@@ -138,11 +138,11 @@
   - config
   - fas
 
-- name: install /usr/local/bin/yubikey-remove.py file 
-  template: > 
-    src="yubikey-remove.py.j2" 
-    dest="/usr/local/bin/yubikey-remove.py" 
-    owner=fas 
+- name: install /usr/local/bin/yubikey-remove.py file
+  template: >
+    src="yubikey-remove.py.j2"
+    dest="/usr/local/bin/yubikey-remove.py"
+    owner=fas
     group=fas
     mode=0750
   tags:
@@ -182,19 +182,19 @@
 #- name: install /var/lib/fedora-ca/.rnd file
 #  file: path=/var/lib/fedora-ca/.rnd owner=fas group=fas mode=0600 setype=httpd_sys_content_t
 #  when: master_fas_node == True
-#  tags:     
+#  tags:
 #  - config
 #  - fas
 
 - name: setup /var/lib/fedora-ca/newcerts directory
   file: path=/var/lib/fedora-ca/newcerts owner=fas group=fas mode=0700 state=directory
   when: master_fas_node == True
-  tags:     
+  tags:
   - config
   - fas
 
 - name: setup /var/lib/fedora-ca/private directory
-  file: path=/var/lib/fedora-ca/private owner=fas group=fas mode=0700 state=directory 
+  file: path=/var/lib/fedora-ca/private owner=fas group=fas mode=0700 state=directory
   when: master_fas_node == True
   tags:
   - config
@@ -270,8 +270,8 @@
 
 - name: twice every month, force a new crl to be created
   cron: >
-    name="gen-crl" 
-    job="cd /var/lib/fedora-ca ; /usr/bin/make gencrl &> /dev/null" 
+    name="gen-crl"
+    job="cd /var/lib/fedora-ca ; /usr/bin/make gencrl &> /dev/null"
     user="fas"
     minute="0"
     hour="0"
@@ -306,7 +306,7 @@
 - name: create /srv/web/ca/cacert.pem link
   file: path="/srv/web/ca/cacert.pem" state=link src="/var/lib/fedora-ca/cacert.pem"
   when: master_fas_node == True
-  tags: 
+  tags:
   - config
   - fas
 
diff --git a/roles/gnome_backups/tasks/main.yml b/roles/gnome_backups/tasks/main.yml
index 32d88835b0..040714cff1 100644
--- a/roles/gnome_backups/tasks/main.yml
+++ b/roles/gnome_backups/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Make sure rdiff-backup is installed 
+- name: Make sure rdiff-backup is installed
   yum: name=rdiff-backup state=latest
 
 - name: Create GNOME backup user
@@ -24,7 +24,7 @@
 
 - name:  Add a Directory for each of the GNOME machines
   file: dest=/gnome_backups/{{ item }} owner=gnomebackup group=gnomebackup state=directory
-  with_items: 
+  with_items:
   - signal.gnome.org
   - webapps2.gnome.org
   - clutter.gnome.org
diff --git a/roles/hosts/tasks/main.yml b/roles/hosts/tasks/main.yml
index 9e4ff15da3..2d2843f750 100644
--- a/roles/hosts/tasks/main.yml
+++ b/roles/hosts/tasks/main.yml
@@ -1,13 +1,13 @@
 ---
 #
-# This task sets up /etc/hosts on a machine. 
+# This task sets up /etc/hosts on a machine.
 #
 # This should only be used in rare cases
 #
 
 #
 # This will move a /etc/hosts in place if it's setup in files for that host/domain
-# Note that if it's not set it will just skip this play and do nothing. 
+# Note that if it's not set it will just skip this play and do nothing.
 #
 - name: setup /etc/hosts for some clients
   copy: src={{ item }} dest=/etc/hosts
diff --git a/roles/infinote/tasks/main.yml b/roles/infinote/tasks/main.yml
index ec4ef76713..697427174e 100644
--- a/roles/infinote/tasks/main.yml
+++ b/roles/infinote/tasks/main.yml
@@ -120,19 +120,19 @@
   - infinote
   - config
 
-- name: enable infinoted 
+- name: enable infinoted
   service: name=infinoted state=running enabled=true
   tags:
   - infinote
   - config
-  
+
 - name: add config file for infinoted
   template: src=infinoted.conf dest=/etc/xdg/infinoted.conf
   notify: restart infinoted
   tags:
   - infinote
   - config
-  
+
 - name: add git commit script for infinote
   copy: src=infinoted-git-commit dest=/usr/local/bin/infinoted-git-commit mode=0755
   tags:
diff --git a/roles/ipsilon/tasks/main.yml b/roles/ipsilon/tasks/main.yml
index c6f3451b27..76b8e9c763 100644
--- a/roles/ipsilon/tasks/main.yml
+++ b/roles/ipsilon/tasks/main.yml
@@ -27,12 +27,12 @@
 - name: copy ipsilon templates
   copy: src=templates/
         dest=/usr/share/ipsilon/templates-fedora
-        owner=ipsilon group=ipsilon mode=0666 
+        owner=ipsilon group=ipsilon mode=0666
 
 - name: copy ipsilon ui assets
   copy: src=ui-fedora/
         dest=/usr/share/ipsilon/ui/fedora
-        owner=ipsilon group=ipsilon mode=0666 
+        owner=ipsilon group=ipsilon mode=0666
 
 - name: copy ipsilon configuration
   template: src={{ item }}.conf
diff --git a/roles/iscsi_client/tasks/main.yml b/roles/iscsi_client/tasks/main.yml
index 3d9489a557..9b4ee9eaea 100644
--- a/roles/iscsi_client/tasks/main.yml
+++ b/roles/iscsi_client/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 #
-# This task sets up iscsid and mpathd on a machine. 
+# This task sets up iscsid and mpathd on a machine.
 #
 #
 - name: install packages needed for iscsi_client (yum)
diff --git a/roles/koji_db/tasks/main.yml b/roles/koji_db/tasks/main.yml
index 6606ee586f..181b517e88 100644
--- a/roles/koji_db/tasks/main.yml
+++ b/roles/koji_db/tasks/main.yml
@@ -18,8 +18,8 @@
   tags:
   - db
   when: is_kojidb == "True"
-# 
-# Load the initial schema and create a file to note that it's loaded now. 
+#
+# Load the initial schema and create a file to note that it's loaded now.
 #
 - name: load initial schema
   shell: creates=/var/lib/pgql/koji-schema psql koji koji < /usr/share/doc/koji*/docs/schema.sql
diff --git a/roles/kojipkgs/tasks/main.yml b/roles/kojipkgs/tasks/main.yml
index a6c10e5726..8fead945c2 100644
--- a/roles/kojipkgs/tasks/main.yml
+++ b/roles/kojipkgs/tasks/main.yml
@@ -1,7 +1,7 @@
 #
 # This is before squid is installed on initial setup so it runs on squid install
 #
-- name: add squid tmpfiles.d to make run dir for smp ipc sockets. 
+- name: add squid tmpfiles.d to make run dir for smp ipc sockets.
   copy: src=squid-tmpfiles dest=/etc/tmpfiles.d/squid.conf owner=root group=root mode=644
   tags:
   - packages
@@ -54,7 +54,7 @@
   - reload httpd
   tags:
   - kojipkgs
-  
+
 - name: make sure httpd listens on port 8080
   lineinfile: dest=/etc/httpd/conf/httpd.conf state=present regexp="^Listen 80" line="Listen 8080"
   notify:
@@ -63,9 +63,9 @@
   - kojipkgs
 
 - name: Copy squid ssl cert from puppet private
-  copy: > 
-    src="{{private}}/files/httpd/wildcard-2014.squid.cert" 
-    dest=/etc/pki/tls/certs/wildcard-2014.squid.cert 
+  copy: >
+    src="{{private}}/files/httpd/wildcard-2014.squid.cert"
+    dest=/etc/pki/tls/certs/wildcard-2014.squid.cert
     owner=root group=root mode=0644
   tags:
   - kojipkgs
@@ -74,7 +74,7 @@
 
 - name: Copy squid ssl key from puppet private
   copy: >
-    src="{{private}}/files/httpd/wildcard-2014.fedoraproject.org.key" 
+    src="{{private}}/files/httpd/wildcard-2014.fedoraproject.org.key"
     dest=/etc/pki/tls/private/wildcard-2014.fedoraproject.org.key
     owner=root group=root mode=0600
   tags:
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 5ca20f357f..3d9ef360fd 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -397,9 +397,9 @@
   tags: mailman
 
 #
-# Only run this on mailman01 for now. 
+# Only run this on mailman01 for now.
 # TODO: run it on lists-dev too
-# 
+#
 
 # The post-update scripts needs memcached to be up (django-compressor will
 # store the timestamps there)
diff --git a/roles/paste/tasks/main.yml b/roles/paste/tasks/main.yml
index 551b8e6a43..0fba5881e1 100644
--- a/roles/paste/tasks/main.yml
+++ b/roles/paste/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 #
-# Setup paste 
+# Setup paste
 #
 - name: install needed packages
   yum: pkg={{ item }} state=present
diff --git a/roles/people/tasks/main.yml b/roles/people/tasks/main.yml
index 92784bad26..e8b13050c4 100644
--- a/roles/people/tasks/main.yml
+++ b/roles/people/tasks/main.yml
@@ -150,7 +150,7 @@
   - selinux
 
 #
-# This sets the default, it's safe to always run. 
+# This sets the default, it's safe to always run.
 # Default quota for users is 2gb
 #
 - name: set default xfs quotas on /srv
@@ -219,7 +219,7 @@
   tags:
   - people
 
-- name: setup script to grab download stats for some groups. 
+- name: setup script to grab download stats for some groups.
   copy: src=grab-daily-logs.sh dest=/usr/local/bin/grab-daily-logs.sh mode=0755
   tags:
   - people
@@ -239,7 +239,7 @@
   tags:
   - people
 
-- name: setup script check for broken planet confs 
+- name: setup script check for broken planet confs
   copy: src=check-broken-planet.py dest=/usr/local/bin/check-broken-planet.py mode=755
   tags:
   - people
@@ -249,7 +249,7 @@
   tags:
   - people
 
-- name: setup cron to run the check for broken planet confs 
+- name: setup cron to run the check for broken planet confs
   copy: src=check-broken-planet.cron dest=/etc/cron.d/check-broken-planet.cron mode=644
   tags:
   - people
diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml
index f5ed81c03a..01a0ad12c6 100644
--- a/roles/planet/tasks/main.yml
+++ b/roles/planet/tasks/main.yml
@@ -11,7 +11,7 @@
   user: name=planet-user uid=104 group=planet-user home=/srv/planet comment="People Planet Eater" createhome=yes system=yes shell=/bin/bash
   tags:
     - planet_server
-    
+
 - name: add apache to planet group
   user: name=apache append=yes groups=planet-user
   tags:
diff --git a/roles/postfix_logreport/tasks/main.yml b/roles/postfix_logreport/tasks/main.yml
index e8c1ab5d6b..238df74471 100644
--- a/roles/postfix_logreport/tasks/main.yml
+++ b/roles/postfix_logreport/tasks/main.yml
@@ -9,7 +9,7 @@
   - packages
 
 - name: install /usr/sbin/pflogsumm
-  copy: src={{ item }} dest="/usr/sbin/{{ item }}" mode=0755 
+  copy: src={{ item }} dest="/usr/sbin/{{ item }}" mode=0755
   with_item:
     - pflogsumm
   tags:
diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml
index 7924ff5c8d..41b8fc0fe6 100644
--- a/roles/postgresql_server/tasks/main.yml
+++ b/roles/postgresql_server/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 #
-# Setup postgresql server. 
+# Setup postgresql server.
 #
 - name: install postgresql server packages
   yum: name={{ item }}  state=present
diff --git a/roles/publican_webhost/tasks/main.yml b/roles/publican_webhost/tasks/main.yml
index 8b819e45f8..2b47064835 100644
--- a/roles/publican_webhost/tasks/main.yml
+++ b/roles/publican_webhost/tasks/main.yml
@@ -16,7 +16,7 @@
 # verify + test
 - name: copy fedwatch triggers
   template: src=20-docs-trigger.sh dest=/etc/fedwatch.d/ owner=root mode=0744
- 
+
 - name: turn on fedwatch.service
   service: name=fedwatch enabled=yes state=started
 
@@ -27,9 +27,9 @@
     # more templating?
 - name: copy publican website config
   template: src=publican-website.cfg dest=/etc/publican-website.cfg
-  
+
     # verify
 - name: copy empty sqlite db; publican only creates this interactively
   copy: src=empty_publican_site.db dest=/var/www/html/{{ publican_brand }}.{{ kojitag }}.db
 
-    # do stuff ?    
+    # do stuff ?
diff --git a/roles/regcfp/tasks/main.yml b/roles/regcfp/tasks/main.yml
index 3e8f5641bb..a8db7bd02c 100644
--- a/roles/regcfp/tasks/main.yml
+++ b/roles/regcfp/tasks/main.yml
@@ -39,7 +39,7 @@
   - flocktofedora.org.intermediate.cert
   notify:
   - restart regcfp
-  
+
 - name: Copy over the ftf cert key
   copy: src="{{private}}/files/httpd/flocktofedora.org.key"
         dest=/etc/pki/tls/private
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index 0745ccc7f5..70b731d81f 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -66,7 +66,7 @@
 # rawhide user 265
 - name: add rawhide user
   user: name=rawhide uid=265 group=rawhide home=/tmp comment="rawhide compose account"
- 
+
 - name: make a bunch of dirs
   file: state=directory path={{ item }}
   with_items:
diff --git a/roles/rsyncd/tasks/main.yml b/roles/rsyncd/tasks/main.yml
index 4c6fd40645..629a264e3e 100644
--- a/roles/rsyncd/tasks/main.yml
+++ b/roles/rsyncd/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 #
-# This role sets up rsyncd on a server 
+# This role sets up rsyncd on a server
 #
 
 - name: install rnecessary packages
diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml
index 3b9ffc66f1..5d0b1562c2 100644
--- a/roles/sudo/tasks/main.yml
+++ b/roles/sudo/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 #
-# This task sets up /etc/sudoers.d/fedora on a machine. 
+# This task sets up /etc/sudoers.d/fedora on a machine.
 #
 
 #
-# Put in place the default sysadmin-main sudoers file. 
+# Put in place the default sysadmin-main sudoers file.
 #
 - name: setup /etc/sudoers.d/01-sysadmin-main
   copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600
@@ -33,7 +33,7 @@
   - sudoers
 
 #
-# This will move a /etc/sudoers.d/ file in place 
+# This will move a /etc/sudoers.d/ file in place
 #
 - name: setup /etc/sudoers.d/sudoer file for client use
   copy: src={{ item }} dest=/etc/sudoers.d/{{ item | basename | replace('.', '_') }}
diff --git a/roles/virthost/tasks/main.yml b/roles/virthost/tasks/main.yml
index 6463de5a86..84317aae4b 100644
--- a/roles/virthost/tasks/main.yml
+++ b/roles/virthost/tasks/main.yml
@@ -40,9 +40,9 @@
   - packages
   when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7
 
-# install libvirtd.conf 
+# install libvirtd.conf
 #
-# This provides us with the ability to use virt-manager from non root accounts. 
+# This provides us with the ability to use virt-manager from non root accounts.
 #
 - name: install libvirtd.conf
   copy: src="{{ files }}/virthost/libvirtd.conf" dest=/etc/libvirt/libvirtd.conf
@@ -55,12 +55,12 @@
   service: name=libvirtd state=started enabled=yes
 
 #
-# Disable lvmetad as it causes lots of problems with iscsi shared lvm and caching. 
+# Disable lvmetad as it causes lots of problems with iscsi shared lvm and caching.
 #
 - name: disable lvmetad
   lineinfile: dest=/etc/lvm/lvm.conf regexp="^    use_lvmetad = 1" line="    use_lvmetad = 0" backrefs=yes
 
-- name: set bridging to work right - 
+- name: set bridging to work right -
   copy: src="{{ files }}/virthost/99-bridge.rules" dest=/etc/udev/rules.d/99-bridge.rules
   notify:
   - restart bridge
diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml
index 1389483771..ab382a8f0e 100644
--- a/roles/web-data-analysis/tasks/main.yml
+++ b/roles/web-data-analysis/tasks/main.yml
@@ -31,7 +31,7 @@
   with_items: [images, getfedora, hotspot, mirrors, start]
   tags:
     - web-data
-    
+
 - name: scripts to condense data down for further processing
   copy: src={{item}} dest=/usr/local/bin/ mode=0755
   with_items: [condense-mirrorlogs.sh, condense-getfedoralogs.sh, run-daily-awstats.sh]
diff --git a/roles/yum-cron/tasks/main.yml b/roles/yum-cron/tasks/main.yml
index 9e82a09a5d..bf209d083a 100644
--- a/roles/yum-cron/tasks/main.yml
+++ b/roles/yum-cron/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 
 #
-# This role adds yum cron package and configuration. 
-# We want this on any public facing Fedora installs so we 
-# can pick up security updates. 
+# This role adds yum cron package and configuration.
+# We want this on any public facing Fedora installs so we
+# can pick up security updates.
 #
 
 - name: install yum-cron
diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml
index 881d8d4628..755420f393 100644
--- a/tasks/cloud_setup_basic.yml
+++ b/tasks/cloud_setup_basic.yml
@@ -53,14 +53,14 @@
 #  tags:
 #  - config
 
-- name: add ansible root key 
+- name: add ansible root key
   authorized_key: user=root key="{{ item }}"
   with_file:
   - /srv/web/infra/ansible/roles/base/files/ansible-pub-key
   tags:
   - config
   - sshkeys
-  
+
 - name: add root keys for sysadmin-main and other allowed users
   authorized_key: user=root key="{{ item }}"
   with_lines: "/srv/web/infra/ansible/scripts/auth-keys-from-fas @sysadmin-main {{ root_auth_users }}"
@@ -94,7 +94,7 @@
   - packages
 
 - name: write out global-update-applied file if we updated
-  copy: content="updated" dest=/etc/sysconfig/global-update-applied 
+  copy: content="updated" dest=/etc/sysconfig/global-update-applied
   when: updated is defined
   tags:
   - packages
diff --git a/tasks/growroot_cloud.yml b/tasks/growroot_cloud.yml
index 63887369af..35f493eb54 100644
--- a/tasks/growroot_cloud.yml
+++ b/tasks/growroot_cloud.yml
@@ -1,4 +1,4 @@
-- name: add infra repo 
+- name: add infra repo
   get_url: url=http://infrastructure.fedoraproject.org/el/infrastructure.repo dest=/etc/yum.repos.d/
   when: is_rhel is defined
   tags:
@@ -16,7 +16,7 @@
   changed_when: "growpart.rc != 1"
   #failed_when: growpart.rc == 2
   ignore_errors: true
- 
+
 - name: reboot the box
   command: /sbin/reboot
   when: growpart.rc == 0
diff --git a/tasks/growroot_cloud_el7.yml b/tasks/growroot_cloud_el7.yml
index b8ae7b13c0..986d6bff27 100644
--- a/tasks/growroot_cloud_el7.yml
+++ b/tasks/growroot_cloud_el7.yml
@@ -1,4 +1,4 @@
-- name: add infra repo 
+- name: add infra repo
   get_url: url=http://infrastructure.fedoraproject.org/el/infrastructure.repo dest=/etc/yum.repos.d/
   when: is_rhel is defined
   tags:
@@ -15,7 +15,7 @@
   always_run: true
   changed_when: "growpart.rc != 1"
   failed_when: growpart.rc == 2
-   
+
 - name: reboot the box
   command: /sbin/reboot
   when: growpart.rc == 0
diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml
index f39060867b..3e28274409 100644
--- a/tasks/persistent_cloud.yml
+++ b/tasks/persistent_cloud.yml
@@ -49,7 +49,7 @@
 #
 # Check that the volume is available
 #
-- local_action: shell nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available' 
+- local_action: shell nova --os-auth-url="{{os_auth_url}}" --os-username="admin" --os-password="{{ADMIN_PASS}}" --os-tenant-name={{inventory_tenant}} volume-list | grep ' {{item.volume_id}} ' | grep 'available'
   with_items: "{{volumes}}"
   register: volume_available
   failed_when: volume_available.rc == 2
diff --git a/tasks/transient_cloud.yml b/tasks/transient_cloud.yml
index 45739041ac..42e2b3f0bb 100644
--- a/tasks/transient_cloud.yml
+++ b/tasks/transient_cloud.yml
@@ -25,8 +25,8 @@
   local_action: add_host hostname="{{ nova_result.public_ip[0] }}" groupname=tmp_just_created
 
 - name: mail off about where it is
-  local_action: mail 
-    to=sysadmin-main-members@fedoraproject.org 
+  local_action: mail
+    to=sysadmin-main-members@fedoraproject.org
     from=ansible-create@fedoraproject.org
     subject="{{ nova_result.public_ip[0] }}"
     body="transient cloud instance created on {{ nova_result.public_ip[0] }}
diff --git a/vars/global.yml b/vars/global.yml
index 47c557fbaa..267fdc87ec 100644
--- a/vars/global.yml
+++ b/vars/global.yml
@@ -48,7 +48,7 @@ rhel66_x86_64: rhel-guest-image-6.6-20141222.0.x86_64
 
 # Set a default hostname base to transient. Override in host vars or command line.
 hostbase: transient
-global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients', 
+global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients',
                    'patch', 'postfix', 'rsync', 'strace',
                    'tmpwatch', 'traceroute', 'vim-enhanced', 'xz', 'zsh',
                    'libselinux-python', 'ntpdate', 'bash-completion', 'telnet',