From c54736fcd5a601f11b388092ab6433f8f552ced4 Mon Sep 17 00:00:00 2001 From: Travis Truman Date: Mon, 11 Jul 2016 15:05:47 -0400 Subject: [PATCH] Removing the infra_hosts and infra_containers groups These inventory groups are not discussed in the documentation, referenced in example config and their presence seems to be a relic of the past. Services that were previously within them seem to now be split between the os-infra_* and shared-infra_* inventory groups. Change-Id: I6f4ef7c73165be3058ebece56415958a80d4599c --- playbooks/inventory/env.d/cinder.yml | 2 -- playbooks/inventory/env.d/galera.yml | 1 - playbooks/inventory/env.d/glance.yml | 1 - playbooks/inventory/env.d/heat.yml | 2 -- playbooks/inventory/env.d/horizon.yml | 1 - playbooks/inventory/env.d/infra.yml | 22 ------------------- playbooks/inventory/env.d/keystone.yml | 1 - playbooks/inventory/env.d/memcache.yml | 1 - playbooks/inventory/env.d/nova.yml | 6 ----- playbooks/inventory/env.d/rabbitmq.yml | 1 - playbooks/inventory/env.d/utility.yml | 1 - .../remove_infra_group-45e7747e341d97cf.yaml | 9 ++++++++ tests/test_inventory.py | 8 +++---- 13 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 playbooks/inventory/env.d/infra.yml create mode 100644 releasenotes/notes/remove_infra_group-45e7747e341d97cf.yaml diff --git a/playbooks/inventory/env.d/cinder.yml b/playbooks/inventory/env.d/cinder.yml index 9aad6b279f..de5d745a0a 100644 --- a/playbooks/inventory/env.d/cinder.yml +++ b/playbooks/inventory/env.d/cinder.yml @@ -31,7 +31,6 @@ component_skel: container_skel: cinder_api_container: belongs_to: - - infra_containers - storage-infra_containers contains: - cinder_api @@ -39,7 +38,6 @@ container_skel: service_name: cinder cinder_scheduler_container: belongs_to: - - infra_containers - storage-infra_containers contains: - cinder_scheduler diff --git a/playbooks/inventory/env.d/galera.yml b/playbooks/inventory/env.d/galera.yml index 9e202e72b9..811a55f7be 100644 --- a/playbooks/inventory/env.d/galera.yml +++ b/playbooks/inventory/env.d/galera.yml @@ -22,7 +22,6 @@ component_skel: container_skel: galera_container: belongs_to: - - infra_containers - shared-infra_containers contains: - galera diff --git a/playbooks/inventory/env.d/glance.yml b/playbooks/inventory/env.d/glance.yml index fa1ce6ae5b..416489a31d 100644 --- a/playbooks/inventory/env.d/glance.yml +++ b/playbooks/inventory/env.d/glance.yml @@ -25,7 +25,6 @@ component_skel: container_skel: glance_container: belongs_to: - - infra_containers - os-infra_containers contains: - glance_api diff --git a/playbooks/inventory/env.d/heat.yml b/playbooks/inventory/env.d/heat.yml index 40415720a5..a62bb7cdaf 100644 --- a/playbooks/inventory/env.d/heat.yml +++ b/playbooks/inventory/env.d/heat.yml @@ -31,7 +31,6 @@ component_skel: container_skel: heat_apis_container: belongs_to: - - infra_containers - os-infra_containers contains: - heat_api_cloudwatch @@ -41,7 +40,6 @@ container_skel: service_name: heat heat_engine_container: belongs_to: - - infra_containers - os-infra_containers contains: - heat_engine diff --git a/playbooks/inventory/env.d/horizon.yml b/playbooks/inventory/env.d/horizon.yml index c73e95e2fc..36eda12db0 100644 --- a/playbooks/inventory/env.d/horizon.yml +++ b/playbooks/inventory/env.d/horizon.yml @@ -22,7 +22,6 @@ component_skel: container_skel: horizon_container: belongs_to: - - infra_containers - os-infra_containers contains: - horizon diff --git a/playbooks/inventory/env.d/infra.yml b/playbooks/inventory/env.d/infra.yml deleted file mode 100644 index 142653cb31..0000000000 --- a/playbooks/inventory/env.d/infra.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Copyright 2014, Rackspace US, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -physical_skel: - infra_containers: - belongs_to: - - all_containers - infra_hosts: - belongs_to: - - hosts diff --git a/playbooks/inventory/env.d/keystone.yml b/playbooks/inventory/env.d/keystone.yml index b1c2e75e8b..3c11b505d9 100644 --- a/playbooks/inventory/env.d/keystone.yml +++ b/playbooks/inventory/env.d/keystone.yml @@ -22,7 +22,6 @@ component_skel: container_skel: keystone_container: belongs_to: - - infra_containers - identity_containers contains: - keystone diff --git a/playbooks/inventory/env.d/memcache.yml b/playbooks/inventory/env.d/memcache.yml index f64ab871a3..c4dfbff023 100644 --- a/playbooks/inventory/env.d/memcache.yml +++ b/playbooks/inventory/env.d/memcache.yml @@ -22,7 +22,6 @@ component_skel: container_skel: memcached_container: belongs_to: - - infra_containers - shared-infra_containers contains: - memcached diff --git a/playbooks/inventory/env.d/nova.yml b/playbooks/inventory/env.d/nova.yml index 4329559766..5bb945af14 100644 --- a/playbooks/inventory/env.d/nova.yml +++ b/playbooks/inventory/env.d/nova.yml @@ -40,7 +40,6 @@ component_skel: container_skel: nova_api_metadata_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_api_metadata @@ -48,7 +47,6 @@ container_skel: service_name: nova nova_api_os_compute_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_api_os_compute @@ -56,7 +54,6 @@ container_skel: service_name: nova nova_cert_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_cert @@ -76,7 +73,6 @@ container_skel: service_name: nova nova_conductor_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_conductor @@ -84,7 +80,6 @@ container_skel: service_name: nova nova_scheduler_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_scheduler @@ -92,7 +87,6 @@ container_skel: service_name: nova nova_console_container: belongs_to: - - infra_containers - os-infra_containers contains: - nova_console diff --git a/playbooks/inventory/env.d/rabbitmq.yml b/playbooks/inventory/env.d/rabbitmq.yml index eddfce1cca..4860cbc839 100644 --- a/playbooks/inventory/env.d/rabbitmq.yml +++ b/playbooks/inventory/env.d/rabbitmq.yml @@ -22,7 +22,6 @@ component_skel: container_skel: rabbit_mq_container: belongs_to: - - infra_containers - shared-infra_containers contains: - rabbitmq diff --git a/playbooks/inventory/env.d/utility.yml b/playbooks/inventory/env.d/utility.yml index 3fffbddb3f..7946bd2665 100644 --- a/playbooks/inventory/env.d/utility.yml +++ b/playbooks/inventory/env.d/utility.yml @@ -22,7 +22,6 @@ component_skel: container_skel: utility_container: belongs_to: - - infra_containers - shared-infra_containers contains: - utility diff --git a/releasenotes/notes/remove_infra_group-45e7747e341d97cf.yaml b/releasenotes/notes/remove_infra_group-45e7747e341d97cf.yaml new file mode 100644 index 0000000000..cd10917221 --- /dev/null +++ b/releasenotes/notes/remove_infra_group-45e7747e341d97cf.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - The ``infra_hosts`` and ``infra_containers`` inventory groups + have been removed. No containers or services were assigned to + these groups exclusively, and the usage of the groups has been + supplanted by the ``shared-infra_*`` and ``os-infra_*`` groups + for some time. Deployers who were using the groups should adjust + any custom configuration in the ``env.d`` directory to assign + containers and/or services to other groups. diff --git a/tests/test_inventory.py b/tests/test_inventory.py index 661300406b..ca89ed4ead 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -129,8 +129,6 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'identity_all', 'identity_containers', 'identity_hosts', - 'infra_containers', - 'infra_hosts', 'ironic-server_hosts', 'ironic_conductor_container', 'ironic_api_container', @@ -476,7 +474,7 @@ class TestConfigChecks(unittest.TestCase): # Even with the same hash seed, different OSes get different results, # eg. local OS X vs gate's Linux config = collections.OrderedDict() - config['infra_hosts'] = { + config['shared-infra_hosts'] = { 'host1': { 'ip': '192.168.1.1' } @@ -519,7 +517,7 @@ class TestConfigChecks(unittest.TestCase): # Even with the same hash seed, different OSes get different results, # eg. local OS X vs gate's Linux config = collections.OrderedDict() - config['infra_hosts'] = { + config['shared-infra_hosts'] = { 'host1': { 'ip': '192.168.1.1' } @@ -538,7 +536,7 @@ class TestConfigChecks(unittest.TestCase): def test_correct_hostname_ip_map(self): config = { - 'infra_hosts': { + 'shared-infra_hosts': { 'host1': { 'ip': '192.168.1.1' }