diff --git a/ansible/check/group_vars/controller b/ansible/check/group_vars/controller
index d90bbd84b..320656db4 100644
--- a/ansible/check/group_vars/controller
+++ b/ansible/check/group_vars/controller
@@ -23,17 +23,17 @@ checks :
     nova_vif_timeout_result:
         url: "none"
         name: "Nova VIF timeout should be >= 300"
-#    neutron_nova_creds:
-#        url: "https://bugzilla.redhat.com/show_bug.cgi?id=1264740"
-#        name: "RHEL OSP Director must be configure with nova-event-callback by default"
     bz1264740:
         url: "https://bugzilla.redhat.com/show_bug.cgi?id=1264740"
         name: "RHEL OSP Director must be configure with nova-event-callback by default"
-    rabbit_partitioned :
+    rabbit_partitioned:
         url: "none"
         name: "Rabbit is currently partitioned - YMMV... Good luck."
-    tuned_profile_result :
+    tuned_profile_result:
         url: "none"
         name: "Ensure Tuned Profile is set to throughput-performance"
+    neutron_rootwrap_daemon:
+        url: "none"
+        name: "Ensure rootwrap has daemon mode enabled"
 
 # vi:syntax=yaml
diff --git a/ansible/check/roles/neutron/tasks/main.yml b/ansible/check/roles/neutron/tasks/main.yml
index 196622344..850e043b6 100644
--- a/ansible/check/roles/neutron/tasks/main.yml
+++ b/ansible/check/roles/neutron/tasks/main.yml
@@ -5,3 +5,10 @@
   failed_when: neutron_nova_creds.rc == 1
   changed_when: false
   ignore_errors: True
+
+- name: Check for rootwrap daemon
+  command: crudini --get /etc/neutron/neutron.conf agent root_helper_daemon
+  register: neutron_rootwrap_daemon
+  failed_when: neutron_rootwrap_daemon.rc == 1
+  changed_when: false
+  ignore_errors: True