diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml
index 5a39897135..d92d0a882b 100644
--- a/ansible/roles/nova/tasks/deploy.yml
+++ b/ansible/roles/nova/tasks/deploy.yml
@@ -22,8 +22,10 @@
         inventory_hostname in groups['compute']
 
 - include_tasks: create_cells.yml
+  when: inventory_hostname in groups['nova-api']
 
 - name: Flush handlers
   meta: flush_handlers
 
 - include_tasks: discover_computes.yml
+  when: inventory_hostname in groups['nova-api']