diff --git a/ansible/check/group_vars/controller b/ansible/check/group_vars/controller
index 74f06653e..dd9e01b50 100644
--- a/ansible/check/group_vars/controller
+++ b/ansible/check/group_vars/controller
@@ -51,5 +51,9 @@ checks :
     neutron_conf_mtu:
         url: "https://bugs.launchpad.net/tripleo/+bug/1590101"
         name: "The global_physnet_mtu should not be set unless by Administrator"
-
+    glance_api_workers:
+        url: "https://bugzilla.redhat.com/show_bug.cgi?id=1361285"
+        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
diff --git a/ansible/check/roles/glance/tasks/main.yml b/ansible/check/roles/glance/tasks/main.yml
new file mode 100644
index 000000000..b7ca9bb76
--- /dev/null
+++ b/ansible/check/roles/glance/tasks/main.yml
@@ -0,0 +1,12 @@
+- name: Glance API worker count
+  command:  crudini --get /etc/glance/glance-api.conf DEFAULT workers
+  register: glance_api_workers
+  failed_when: glance_api_workers.rc == 1
+  changed_when: false
+  ignore_errors: true
+- name: Glance Registry worker count
+  command:  crudini --get /etc/glance/glance-registry.conf DEFAULT workers
+  register: glance_registry_workers
+  failed_when: glance_registry_workers.rc == 1
+  changed_when: false
+  ignore_errors: true
diff --git a/ansible/check/roles/keystone/tasks/main.yml b/ansible/check/roles/keystone/tasks/main.yml
index 86d0d47dd..eff64b3b7 100644
--- a/ansible/check/roles/keystone/tasks/main.yml
+++ b/ansible/check/roles/keystone/tasks/main.yml
@@ -39,7 +39,6 @@
   register: bz1330980
   failed_when: bz1330980.stdout|int < keystone_processes
   when: keystone_in_eventlet.stdout|int == 0
-  failed_when:
   ignore_errors: True
 
 - name: Keystone HTTP main processes
diff --git a/ansible/check/site.yml b/ansible/check/site.yml
index cff91c547..1d8c0add0 100644
--- a/ansible/check/site.yml
+++ b/ansible/check/site.yml
@@ -32,6 +32,7 @@
   - keystone
   - neutron
   - nova
+  - glance
 
 - hosts: compute
   name: Checking Compute Nodes for common Performance Issues