diff --git a/ansible/group_vars/all/nova b/ansible/group_vars/all/nova
index 06f7ce5ea..d08eb0a80 100644
--- a/ansible/group_vars/all/nova
+++ b/ansible/group_vars/all/nova
@@ -2,6 +2,7 @@
 ###############################################################################
 # Nova configuration.
 
-# Which group to use to deploy the nova-compute services for ironic. By default
-# all hosts in the nova group are used - typically the controllers.
-kolla_nova_compute_ironic_group: nova
+# Which host to use to deploy the nova-compute services for ironic. By default
+# this is none and all hosts in the nova group are used instead - typically the
+# controllers.
+kolla_nova_compute_ironic_host:
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index 2d8a03a78..da88e5f45 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -210,9 +210,10 @@ kolla_openstack_logging_debug:
 # Nova options
 #######################
 
-# Which group to use to deploy the nova-compute services for ironic. By default
-# all hosts in the nova group are used - typically the controllers.
-kolla_nova_compute_ironic_group: nova
+# Which host to use to deploy the nova-compute services for ironic. By default
+# this is none and all hosts in the nova group are used instead - typically the
+# controllers.
+kolla_nova_compute_ironic_host:
 
 ###############################################################################
 # Extra free-form configuraton.
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 2ae5fd531..3b9f9f4e4 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -37,11 +37,16 @@ nova
 [nova-spicehtml5proxy:children]
 nova
 
-[nova-compute-ironic:children]
 # NOTE: HA for nova-compute services with ironic is still an experimental
 # feature. Provide the option to use a single compute host, even when multiple
 # controllers are in use.
-{{ kolla_nova_compute_ironic_group }}
+{% if kolla_nova_compute_ironic_host is not none %}
+[nova-compute-ironic]
+{{ kolla_nova_compute_ironic_host }}
+{% else %}
+[nova-compute-ironic:children]
+nova
+{% endif %}
 
 [nova-serialproxy:children]
 nova
diff --git a/doc/source/release-notes.rst b/doc/source/release-notes.rst
index 93e667d03..19520e25c 100644
--- a/doc/source/release-notes.rst
+++ b/doc/source/release-notes.rst
@@ -20,7 +20,7 @@ Features
 * Adds support for specifying a local Yum mirror for package installation.
 * Adds the command ``kayobe network connectivity check`` which can be used to
   verify network connectivity in the cloud hosts.
-* Adds a variable ``kolla_nova_compute_ironic_group`` which may be used to set
+* Adds a variable ``kolla_nova_compute_ironic_host`` which may be used to set
   which hosts run the nova compute service for ironic. This may be used to
   avoid the experimental HA nova compute service for ironic, by specifying a
   single host.
diff --git a/etc/kayobe/nova.yml b/etc/kayobe/nova.yml
index 991e517f6..6abf14500 100644
--- a/etc/kayobe/nova.yml
+++ b/etc/kayobe/nova.yml
@@ -2,9 +2,10 @@
 ###############################################################################
 # Nova configuration.
 
-# Which group to use to deploy the nova-compute services for ironic. By default
-# all hosts in the nova group are used - typically the controllers.
-#kolla_nova_compute_ironic_group:
+# Which host to use to deploy the nova-compute services for ironic. By default
+# this is none and all hosts in the nova group are used instead - typically the
+# controllers.
+#kolla_nova_compute_ironic_host:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.