From 4cba47c1d3a186d189c75e903cbb8be39602fa0f Mon Sep 17 00:00:00 2001
From: "Jesse Pretorius (odyssey4me)" <jesse.pretorius@rackspace.co.uk>
Date: Wed, 7 Jun 2017 15:18:07 +0000
Subject: [PATCH] Revert "Reduce container counts for cinder, ironic and trove"

A fully hyper-converged deployment is fine, but this has not
been done with an agreed spec, nor has it been completed.

This patch is being reverted with the agreement that there
will be a spec and we can tackle this properly in Queens.

This reverts commit b769a6e0c128b96b23dd696a305145f2077c3151.

Change-Id: Ia7ac1084db7610800dca7a860fddc2ad825fa101
---
 playbooks/inventory/env.d/cinder.yml |  6 ++++++
 playbooks/inventory/env.d/ironic.yml | 18 +++++++++++++++++-
 playbooks/inventory/env.d/trove.yml  | 12 ++++++++++++
 tests/test_inventory.py              |  8 ++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/playbooks/inventory/env.d/cinder.yml b/playbooks/inventory/env.d/cinder.yml
index 04158a2a5a..df5acb0c74 100644
--- a/playbooks/inventory/env.d/cinder.yml
+++ b/playbooks/inventory/env.d/cinder.yml
@@ -34,6 +34,12 @@ container_skel:
       - storage-infra_containers
     contains:
       - cinder_api
+    properties:
+      service_name: cinder
+  cinder_scheduler_container:
+    belongs_to:
+      - storage-infra_containers
+    contains:
       - cinder_scheduler
   cinder_volumes_container:
     belongs_to:
diff --git a/playbooks/inventory/env.d/ironic.yml b/playbooks/inventory/env.d/ironic.yml
index c04447fade..237980a4e0 100644
--- a/playbooks/inventory/env.d/ironic.yml
+++ b/playbooks/inventory/env.d/ironic.yml
@@ -23,7 +23,7 @@ component_skel:
       - ironic_all
   ironic_server:
     belongs_to:
-      - ironic_all
+      - ironic_servers
   ironic_compute:
     belongs_to:
       - nova_all
@@ -35,8 +35,18 @@ container_skel:
       - ironic-infra_containers
     contains:
       - ironic_api
+  ironic_conductor_container:
+    belongs_to:
+      - ironic-infra_containers
+    contains:
       - ironic_conductor
+  ironic_server_container:
+    belongs_to:
+      - ironic-server_containers
+    contains:
       - ironic_server
+    properties:
+      is_metal: true
   ironic_compute_container:
     belongs_to:
       - ironic-compute_containers
@@ -57,6 +67,12 @@ physical_skel:
   ironic-infra_hosts:
     belongs_to:
       - hosts
+  ironic-server_containers:
+    belongs_to:
+      - all_containers
+  ironic-server_hosts:
+    belongs_to:
+      - hosts
   ironic-compute_containers:
     belongs_to:
       - all_containers
diff --git a/playbooks/inventory/env.d/trove.yml b/playbooks/inventory/env.d/trove.yml
index e7cbbb73f0..30284c1b2f 100644
--- a/playbooks/inventory/env.d/trove.yml
+++ b/playbooks/inventory/env.d/trove.yml
@@ -33,7 +33,19 @@ container_skel:
       - trove-infra_containers
     contains:
       - trove_api
+    properties:
+      service_name: trove
+  trove_conductor_container:
+    belongs_to:
+      - trove-infra_containers
+    contains:
       - trove_conductor
+    properties:
+      service_name: trove
+  trove_taskmanager_container:
+    belongs_to:
+      - trove-infra_containers
+    contains:
       - trove_taskmanager
 
 physical_skel:
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 7e37953fb7..14645851d6 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -166,6 +166,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'cinder_api_container',
         'cinder_backup',
         'cinder_scheduler',
+        'cinder_scheduler_container',
         'cinder_volume',
         'cinder_volumes_container',
         'compute-infra_all',
@@ -231,11 +232,16 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'ironic-infra_all',
         'ironic-infra_containers',
         'ironic-infra_hosts',
+        'ironic-server_containers',
+        'ironic-server_hosts',
         'ironic_all',
         'ironic_api',
         'ironic_api_container',
         'ironic_conductor',
+        'ironic_conductor_container',
         'ironic_server',
+        'ironic_server_container',
+        'ironic_servers',
         'ironic_compute',
         'ironic_compute_container',
         'ironic-compute_containers',
@@ -269,7 +275,9 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'trove_api',
         'trove_conductor',
         'trove_taskmanager',
+        'trove_conductor_container',
         'trove_api_container',
+        'trove_taskmanager_container',
         'trove-infra_containers',
         'trove-infra_hosts',
         'trove-infra_all',