diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml
index 986970c72..71c5765b5 100644
--- a/ansible/kolla-openstack.yml
+++ b/ansible/kolla-openstack.yml
@@ -1,6 +1,14 @@
 ---
+
+- name: Ensure Ironic is enabled
+  hosts: controllers
+  tasks:
+    - name: Create controllers group with ironic enabled
+      group_by:
+        key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
+
 - name: Ensure locally built Ironic Python Agent images are copied
-  hosts: controllers[0]
+  hosts: controllers_with_ironic_enabled_True
   vars:
     # These are the filenames generated by overcloud-ipa-build.yml.
     ipa_image_name: "ipa"