Merge "Remove ironic_server from env.d"

etc/openstack_deploy/env.d/aio_metal.yml.example

@@ -51,9 +51,6 @@ container_skel:
   ironic_api_container:
     properties:
       is_metal: true
-  ironic_server_container:
-    properties:
-      is_metal: true
   ironic_compute_container:
     properties:
       is_metal: true

inventory/env.d/ironic.yml

@@ -21,10 +21,6 @@ component_skel:
   ironic_conductor:
     belongs_to:
       - ironic_all
-  ironic_server:
-    belongs_to:
-      - ironic_all
-      - ironic_servers
   ironic_compute:
     belongs_to:
       - nova_all
@@ -39,11 +35,6 @@ container_skel:
     contains:
       - ironic_api
       - ironic_conductor
-  ironic_server_container:
-    belongs_to:
-      - ironic-server_containers
-    contains:
-      - ironic_server
     properties:
       is_metal: true
   ironic_compute_container:
@@ -70,12 +61,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

inventory/inventory.ini

@@ -128,12 +128,10 @@ heat_engine
 ironic_api
 ironic_compute
 ironic_conductor
-ironic_server
 ironic_inspector
 [ironic_api]
 [ironic_compute]
 [ironic_conductor]
-[ironic_server]
 [ironic_inspector]
 
 [keystone_all]

tests/test_inventory.py

@@ -256,15 +256,10 @@ 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_server',
-        'ironic_server_container',
-        'ironic_servers',
         'ironic_compute',
         'ironic_compute_container',
         'ironic-compute_containers',