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

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

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

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

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

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

playbooks/inventory/env.d/infra.yml

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

playbooks/inventory/env.d/keystone.yml

@@ -22,7 +22,6 @@ component_skel:
 container_skel:
   keystone_container:
     belongs_to:
-      - infra_containers
       - identity_containers
     contains:
       - keystone

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

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

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

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

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.

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'
                 }