Merge "Hyper-converge our container usage"

playbooks/inventory/env.d/cinder.yml

@@ -34,10 +34,6 @@ container_skel:
       - storage-infra_containers
     contains:
       - cinder_api
-  cinder_scheduler_container:
-    belongs_to:
-      - storage-infra_containers
-    contains:
       - cinder_scheduler
   cinder_volumes_container:
     belongs_to:

playbooks/inventory/env.d/heat.yml

@@ -29,7 +29,7 @@ component_skel:
 
 
 container_skel:
-  heat_apis_container:
+  heat_api_container:
     belongs_to:
       - orchestration_containers
       - os-infra_containers
@@ -37,11 +37,6 @@ container_skel:
       - heat_api_cloudwatch
       - heat_api_cfn
       - heat_api
-  heat_engine_container:
-    belongs_to:
-      - orchestration_containers
-      - os-infra_containers
-    contains:
       - heat_engine
 
 

playbooks/inventory/env.d/ironic.yml

@@ -23,6 +23,7 @@ component_skel:
       - ironic_all
   ironic_server:
     belongs_to:
+      - ironic_all
       - ironic_servers
   ironic_compute:
     belongs_to:
@@ -35,10 +36,6 @@ container_skel:
       - ironic-infra_containers
     contains:
       - ironic_api
-  ironic_conductor_container:
-    belongs_to:
-      - ironic-infra_containers
-    contains:
       - ironic_conductor
   ironic_server_container:
     belongs_to:

playbooks/inventory/env.d/nova.yml

@@ -38,24 +38,17 @@ component_skel:
 
 
 container_skel:
-  nova_api_metadata_container:
+  nova_api_container:
     belongs_to:
       - compute-infra_containers
       - os-infra_containers
     contains:
       - nova_api_metadata
-  nova_api_os_compute_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
       - nova_api_os_compute
-  nova_api_placement_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
       - nova_api_placement
+      - nova_conductor
+      - nova_scheduler
+      - nova_console
   nova_compute_container:
     belongs_to:
       - compute_containers
@@ -70,24 +63,6 @@ container_skel:
       - nova_compute
     properties:
       is_metal: true
-  nova_conductor_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_conductor
-  nova_scheduler_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_scheduler
-  nova_console_container:
-    belongs_to:
-      - compute-infra_containers
-      - os-infra_containers
-    contains:
-      - nova_console
 
 
 physical_skel:

playbooks/inventory/env.d/trove.yml

@@ -27,23 +27,17 @@ component_skel:
     belongs_to:
       - trove_all
 
+
 container_skel:
   trove_api_container:
     belongs_to:
       - trove-infra_containers
     contains:
       - trove_api
-  trove_conductor_container:
-    belongs_to:
-      - trove-infra_containers
-    contains:
       - trove_conductor
-  trove_taskmanager_container:
-    belongs_to:
-      - trove-infra_containers
-    contains:
       - trove_taskmanager
 
+
 physical_skel:
   trove-infra_containers:
     belongs_to:

tests/test_inventory.py

@@ -166,7 +166,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'cinder_api_container',
         'cinder_backup',
         'cinder_scheduler',
-        'cinder_scheduler_container',
         'cinder_volume',
         'cinder_volumes_container',
         'compute-infra_all',
@@ -216,9 +215,8 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'heat_api',
         'heat_api_cfn',
         'heat_api_cloudwatch',
-        'heat_apis_container',
+        'heat_api_container',
         'heat_engine',
-        'heat_engine_container',
         'horizon',
         'horizon_all',
         'horizon_container',
@@ -238,7 +236,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'ironic_api',
         'ironic_api_container',
         'ironic_conductor',
-        'ironic_conductor_container',
         'ironic_server',
         'ironic_server_container',
         'ironic_servers',
@@ -286,9 +283,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',
@@ -337,19 +332,14 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'neutron_server_container',
         'nova_all',
         'nova_api_metadata',
-        'nova_api_metadata_container',
         'nova_api_os_compute',
-        'nova_api_os_compute_container',
+        'nova_api_container',
         'nova_api_placement',
-        'nova_api_placement_container',
         'nova_compute',
         'nova_compute_container',
         'nova_conductor',
-        'nova_conductor_container',
         'nova_console',
-        'nova_console_container',
         'nova_scheduler',
-        'nova_scheduler_container',
         'opendaylight',
         'operator_containers',
         'operator_hosts',