Reduce container counts for cinder, ironic and trove

To lower our deployment times and resouce consumption we're removing
single purpose containers that have little to no benefit on the
architecture at scale.

Change-Id: I58e7055548d4b3ab4c2d02619763461476b3b3b5
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

playbooks/inventory/env.d/cinder.yml

@@ -34,12 +34,6 @@ container_skel:
       - storage-infra_containers
     contains:
       - cinder_api
-    properties:
-      service_name: cinder
-  cinder_scheduler_container:
-    belongs_to:
-      - storage-infra_containers
-    contains:
       - cinder_scheduler
     properties:
       service_name: cinder

playbooks/inventory/env.d/ironic.yml

@@ -23,7 +23,7 @@ component_skel:
       - ironic_all
   ironic_server:
     belongs_to:
-      - ironic_servers
+      - ironic_all
   ironic_compute:
     belongs_to:
       - nova_all
@@ -35,22 +35,9 @@ container_skel:
       - ironic-infra_containers
     contains:
       - ironic_api
-    properties:
-      service_name: ironic
-  ironic_conductor_container:
-    belongs_to:
-      - ironic-infra_containers
-    contains:
       - ironic_conductor
-    properties:
-      service_name: ironic
-  ironic_server_container:
-    belongs_to:
-      - ironic-server_containers
-    contains:
       - ironic_server
     properties:
-      is_metal: true
       service_name: ironic
   ironic_compute_container:
     belongs_to:
@@ -73,12 +60,6 @@ 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

playbooks/inventory/env.d/trove.yml

@@ -33,19 +33,7 @@ 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
     properties:
       service_name: trove

tests/test_inventory.py

@@ -165,7 +165,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'cinder_api_container',
         'cinder_backup',
         'cinder_scheduler',
-        'cinder_scheduler_container',
         'cinder_volume',
         'cinder_volumes_container',
         'compute-infra_all',
@@ -226,16 +225,11 @@ 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,9 +263,7 @@ 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',