diff --git a/.gitignore b/.gitignore
index 8d830a2f9..39f94a42a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,11 @@ ansible/hosts
 # Prevent any fernet keys from sneaking into git repo
 ansible/browbeat/roles/keystone-token/files/[0-9]
 
+# Prevent Ansible Checks data/scripts from entering git repo:
+ansible/check/mysqltuner.pl
+ansible/bug_report.log
+ansible/mysql_report.log
+
 log/*
 
 # Swap files
diff --git a/ansible/check/group_vars/all b/ansible/check/group_vars/all.yml
similarity index 88%
rename from ansible/check/group_vars/all
rename to ansible/check/group_vars/all.yml
index 2e2cd4c30..dbfe9b5ba 100644
--- a/ansible/check/group_vars/all
+++ b/ansible/check/group_vars/all.yml
@@ -1,5 +1,4 @@
 ---
-# vi:syntax=yaml
 result_dir: "{{inventory_dir}}/"
 
 mysql_tuner_script: https://raw.githubusercontent.com/major/MySQLTuner-perl/master/mysqltuner.pl
diff --git a/ansible/check/group_vars/ceph b/ansible/check/group_vars/ceph.yml
similarity index 100%
rename from ansible/check/group_vars/ceph
rename to ansible/check/group_vars/ceph.yml
diff --git a/ansible/check/group_vars/compute b/ansible/check/group_vars/compute.yml
similarity index 97%
rename from ansible/check/group_vars/compute
rename to ansible/check/group_vars/compute.yml
index 75d3416c9..d9453c063 100644
--- a/ansible/check/group_vars/compute
+++ b/ansible/check/group_vars/compute.yml
@@ -20,6 +20,3 @@ checks:
     bz1264740:
         url: "https://bugzilla.redhat.com/show_bug.cgi?id=1264740"
         name: "RHEL OSP Director must be configure with nova-event-callback by default"
-
-
-# vi:syntax=yaml
diff --git a/ansible/check/group_vars/controller b/ansible/check/group_vars/controller.yml
similarity index 91%
rename from ansible/check/group_vars/controller
rename to ansible/check/group_vars/controller.yml
index dd9e01b50..ab134836d 100644
--- a/ansible/check/group_vars/controller
+++ b/ansible/check/group_vars/controller.yml
@@ -7,6 +7,8 @@ mariadb_max_connections: 4096
 mysqld_soft_fd: 16384
 nova_vif_timeout: 300
 netdev_max_backlog: 100000
+keystone_threads: 6
+keystone_processes: 2
 
 checks :
     bz1095811 :
@@ -56,4 +58,6 @@ checks :
         name: "Glance API wokres should be set to None , thereby defaulting to number of cores"
     glance_registry_workers:
         url: "https://bugzilla.redhat.com/show_bug.cgi?id=1361285"
-# vi:syntax=yaml
+    bz1347305:
+        url: "https://bugzilla.redhat.com/show_bug.cgi?id=1347305"
+        name: "Overcloud deployed with keystone as single process leads to abysmal performance"
diff --git a/ansible/check/group_vars/undercloud b/ansible/check/group_vars/undercloud.yml
similarity index 99%
rename from ansible/check/group_vars/undercloud
rename to ansible/check/group_vars/undercloud.yml
index e318556e1..3df2fa4e0 100644
--- a/ansible/check/group_vars/undercloud
+++ b/ansible/check/group_vars/undercloud.yml
@@ -47,4 +47,3 @@ checks :
     bz1330980:
         url: "https://bugzilla.redhat.com/show_bug.cgi?id=1330980"
         name: "Undercloud deployed with 1 keystone worker and cpu_count for threads"
-# vi:syntax=yaml
diff --git a/ansible/check/roles/keystone/tasks/main.yml b/ansible/check/roles/keystone/tasks/main.yml
index eff64b3b7..73d02ecc7 100644
--- a/ansible/check/roles/keystone/tasks/main.yml
+++ b/ansible/check/roles/keystone/tasks/main.yml
@@ -34,30 +34,30 @@
 
 - debug: msg="Keystone deployed in:{{ keystone_deployment }}"
 
-- name: Keystone HTTP admin processes
-  command: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*admin.conf | egrep -o "[0-9]+"
+- name: Keystone HTTP admin processes (Undercloud)
+  shell: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*admin.conf | egrep -o "[0-9]+"
   register: bz1330980
   failed_when: bz1330980.stdout|int < keystone_processes
-  when: keystone_in_eventlet.stdout|int == 0
+  when: (keystone_in_eventlet.stdout|int == 0) and (inventory_hostname in groups.undercloud)
   ignore_errors: True
 
-- name: Keystone HTTP main processes
-  command: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*main.conf | egrep -o "[0-9]+"
+- name: Keystone HTTP main processes (Undercloud)
+  shell: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*main.conf | egrep -o "[0-9]+"
   register: bz1330980
   failed_when: bz1330980.stdout|int < keystone_processes
-  when: keystone_in_eventlet.stdout|int == 0
+  when: (keystone_in_eventlet.stdout|int == 0) and (inventory_hostname in groups.undercloud)
   ignore_errors: True
 
-- name: Keystone HTTP admin threads
-  command: egrep -o "threads=[0-9]+" /etc/httpd/conf.d/*keystone*admin.conf | egrep -o "[0-9]+"
-  register: bz1330980
-  failed_when: bz1330980.stdout|int < keystone_threads
-  when: keystone_in_eventlet.stdout|int == 0
+- name: Keystone HTTP admin processes (Controller)
+  shell: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*admin.conf | egrep -o "[0-9]+"
+  register: bz1347305
+  failed_when: bz1347305.stdout|int < keystone_processes
+  when: (keystone_in_eventlet.stdout|int == 0) and (inventory_hostname in groups.controller)
   ignore_errors: True
 
-- name: Keystone HTTP main threads
-  command: egrep -o "threads=[0-9]+" /etc/httpd/conf.d/*keystone*main.conf | egrep -o "[0-9]+"
-  register: bz1330980
-  failed_when: bz1330980.stdout|int < keystone_threads
-  when: keystone_in_eventlet.stdout|int == 0
+- name: Keystone HTTP main processes (Controller)
+  shell: egrep -o "processes=[0-9]+" /etc/httpd/conf.d/*keystone*main.conf | egrep -o "[0-9]+"
+  register: bz1347305
+  failed_when: bz1347305.stdout|int < keystone_processes
+  when: (keystone_in_eventlet.stdout|int == 0) and (inventory_hostname in groups.controller)
   ignore_errors: True