Hyper-converge our container usage

This change groups services into fewer containers. This does not
mix service categories so there's no worry of cross polluting a
different service with unknown packages and workloads. This only
minimizes the container types we have which reduces our resource
consumption and improves upgrade/deployment time.

Implements: spec Hyperconverged Containers
Change-Id: Ie04dbbe2bdb7a9b0c5f4e4d9dc8006a1b7b9b558
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2017-08-30 18:53:31 -05:00 committed by Kevin Carter (cloudnull)
parent 3c74b99ea4
commit 1200ee1bee
6 changed files with 10 additions and 63 deletions

View File

@ -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:

View File

@ -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

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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',