From b0a67996c383c7a0ad7e0e0f9a17bfaa687c46f4 Mon Sep 17 00:00:00 2001
From: Darren Hoyland <darren.hoyland@verneglobal.com>
Date: Mon, 13 Nov 2017 15:46:17 +0000
Subject: [PATCH] (potential) fix for
 https://github.com/stackhpc/kayobe/issues/71

---
 ansible/roles/kolla-ansible/defaults/main.yml              | 2 ++
 .../roles/kolla-ansible/templates/overcloud-services.j2    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index 2d8a03a78..01f683291 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -210,6 +210,8 @@ kolla_openstack_logging_debug:
 # Nova options
 #######################
 
+kolla_nova_compute_ironic_host:
+
 # 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
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 2ae5fd531..4c8628499 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.
+{% if kolla_nova_compute_ironic_host is not none %}
+[nova-compute-ironic]
+{{ kolla_nova_compute_ironic_host }}
+{% else %}
+[nova-compute-ironic:children]
 {{ kolla_nova_compute_ironic_group }}
+{% endif %}
 
 [nova-serialproxy:children]
 nova