From 80b30b8a984b18801175ab9b5f94ecd6257d1c88 Mon Sep 17 00:00:00 2001
From: Darren Hoyland <darren.hoyland@verneglobal.com>
Date: Mon, 13 Nov 2017 16:16:01 +0000
Subject: [PATCH] The default group doesn't need to be configurable

---
 ansible/group_vars/all/nova                                | 7 ++-----
 ansible/roles/kolla-ansible/defaults/main.yml              | 7 ++-----
 .../roles/kolla-ansible/templates/overcloud-services.j2    | 2 +-
 doc/source/release-notes.rst                               | 2 +-
 etc/kayobe/nova.yml                                        | 7 ++++---
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ansible/group_vars/all/nova b/ansible/group_vars/all/nova
index 9c5dbf451..d08eb0a80 100644
--- a/ansible/group_vars/all/nova
+++ b/ansible/group_vars/all/nova
@@ -2,10 +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 the kolla_nova_compute_ironic_group is used instead.
+# 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 ec76d8a6d..da88e5f45 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -210,12 +210,9 @@ 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 the kolla_nova_compute_ironic_group is used instead.
+# 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/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 4c8628499..3b9f9f4e4 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -45,7 +45,7 @@ nova
 {{ kolla_nova_compute_ironic_host }}
 {% else %}
 [nova-compute-ironic:children]
-{{ kolla_nova_compute_ironic_group }}
+nova
 {% endif %}
 
 [nova-serialproxy:children]
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.