From e994882ae4fef4887a6ad73ee5583a13852ec3ad Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 15 Mar 2017 09:44:43 +0000
Subject: [PATCH] Synchronise Kolla inventory template with upstream

---
 .../kolla-ansible/templates/overcloud.j2      | 131 +++++++++++++++++-
 1 file changed, 130 insertions(+), 1 deletion(-)

diff --git a/ansible/roles/kolla-ansible/templates/overcloud.j2 b/ansible/roles/kolla-ansible/templates/overcloud.j2
index 6fd78fd1f..670a4a229 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud.j2
@@ -8,6 +8,7 @@
 {% for controller in groups['controllers'] %}
 {% set controller_hv=hostvars[controller] %}
 {{ controller }}{% if "ansible_host" in controller_hv %}    ansible_host={{ controller_hv["ansible_host"] }}{% endif %}
+
 {% endfor %}
 
 [controllers:vars]
@@ -25,7 +26,6 @@ controllers
 controllers
 
 [compute:children]
-controllers
 
 [monitoring:children]
 controllers
@@ -33,6 +33,8 @@ controllers
 [storage:children]
 controllers
 
+[deployment]
+
 [baremetal:children]
 control
 network
@@ -54,11 +56,18 @@ control
 [influxdb:children]
 monitoring
 
+[karbor:children]
+control
+
 [kibana:children]
 control
 
 [telegraf:children]
+compute
+control
 monitoring
+network
+storage
 
 [elasticsearch:children]
 control
@@ -93,6 +102,9 @@ control
 [cloudkitty:children]
 control
 
+[freezer:children]
+control
+
 [memcached:children]
 control
 
@@ -111,6 +123,9 @@ control
 [murano:children]
 control
 
+[solum:children]
+control
+
 [ironic:children]
 control
 
@@ -138,9 +153,18 @@ control
 [congress:children]
 control
 
+[panko:children]
+control
+
 [gnocchi:children]
 control
 
+[tacker:children]
+control
+
+[trove:children]
+control
+
 # Tempest
 [tempest:children]
 control
@@ -157,6 +181,21 @@ control
 [rally:children]
 control
 
+[searchlight:children]
+control
+
+[octavia:children]
+control
+
+[designate:children]
+control
+
+[placement:children]
+control
+
+[bifrost:children]
+deployment
+
 # Additional control implemented here. These groups allow you to control which
 # services run on which hosts at a per-service level.
 #
@@ -193,6 +232,9 @@ nova
 [nova-compute-ironic:children]
 nova
 
+[nova-serialproxy:children]
+nova
+
 # Neutron
 [neutron-server:children]
 control
@@ -242,6 +284,10 @@ cloudkitty
 [cloudkitty-processor:children]
 cloudkitty
 
+# Freezer
+[freezer-api:children]
+freezer
+
 # iSCSI
 [iscsid:children]
 compute
@@ -251,6 +297,16 @@ ironic-conductor
 [tgtd:children]
 storage
 
+# Karbor
+[karbor-api:children]
+karbor
+
+[karbor-protection:children]
+karbor
+
+[karbor-operationengine:children]
+karbor
+
 # Manila
 [manila-api:children]
 manila
@@ -261,6 +317,9 @@ manila
 [manila-share:children]
 network
 
+[manila-data:children]
+manila
+
 # Swift
 [swift-proxy-server:children]
 swift
@@ -328,6 +387,19 @@ sahara
 [sahara-engine:children]
 sahara
 
+# Solum
+[solum-api:children]
+solum
+
+[solum-worker:children]
+solum
+
+[solum-deployer:children]
+solum
+
+[solum-conductor:children]
+solum
+
 # Mistral
 [mistral-api:children]
 mistral
@@ -377,6 +449,10 @@ congress
 [congress-policy-engine:children]
 congress
 
+# Panko
+[panko-api:children]
+panko
+
 # Gnocchi
 [gnocchi-api:children]
 gnocchi
@@ -387,6 +463,16 @@ gnocchi
 [gnocchi-metricd:children]
 gnocchi
 
+# Trove
+[trove-api:children]
+trove
+
+[trove-conductor:children]
+trove
+
+[trove-taskmanager:children]
+trove
+
 # Multipathd
 [multipathd:children]
 compute
@@ -407,3 +493,46 @@ senlin
 
 [senlin-engine:children]
 senlin
+
+# Searchlight
+[searchlight-api:children]
+searchlight
+
+[searchlight-listener:children]
+searchlight
+
+# Octavia
+[octavia-api:children]
+octavia
+
+[octavia-health-manager:children]
+octavia
+
+[octavia-housekeeping:children]
+octavia
+
+[octavia-worker:children]
+octavia
+
+# Designate
+[designate-api:children]
+designate
+
+[designate-central:children]
+designate
+
+[designate-mdns:children]
+designate
+
+[designate-worker:children]
+designate
+
+[designate-sink:children]
+designate
+
+[designate-backend-bind9:children]
+designate
+
+# Placement
+[placement-api:children]
+placement