diff --git a/ansible/check/group_vars/undercloud b/ansible/check/group_vars/undercloud
index 5794cefb5..e318556e1 100644
--- a/ansible/check/group_vars/undercloud
+++ b/ansible/check/group_vars/undercloud
@@ -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 :
     bz1282491 :
@@ -42,5 +44,7 @@ checks :
     neutron_rootwrap_daemon:
         url: "none"
         name: "Ensure rootwrap has daemon mode enabled"
-
+    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 4469ca633..86d0d47dd 100644
--- a/ansible/check/roles/keystone/tasks/main.yml
+++ b/ansible/check/roles/keystone/tasks/main.yml
@@ -33,3 +33,32 @@
   when: keystone_in_eventlet.stdout|int > 0
 
 - 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]+"
+  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
+  command: 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
+  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
+  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
+  ignore_errors: True
diff --git a/ansible/check/site.yml b/ansible/check/site.yml
index f45b29e49..cff91c547 100644
--- a/ansible/check/site.yml
+++ b/ansible/check/site.yml
@@ -17,6 +17,7 @@
   remote_user: stack
   roles:
   - common
+  - controller
   - undercloud
   - keystone
   - neutron