From 8530ed089a2d21592117ec0b3ff40c56f142547c Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 4 Aug 2022 16:26:50 +0100 Subject: [PATCH] Remove ironic_server from env.d Nothing references this group, and it is empty in a deployment running the ironic service Change-Id: I66b0bd17ec8fb8404ddeef66c4f9b0f54b832b36 --- etc/openstack_deploy/env.d/aio_metal.yml.example | 3 --- inventory/env.d/ironic.yml | 15 --------------- inventory/inventory.ini | 2 -- tests/test_inventory.py | 5 ----- 4 files changed, 25 deletions(-) diff --git a/etc/openstack_deploy/env.d/aio_metal.yml.example b/etc/openstack_deploy/env.d/aio_metal.yml.example index 922ce9a419..2e1a0a21a3 100644 --- a/etc/openstack_deploy/env.d/aio_metal.yml.example +++ b/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 diff --git a/inventory/env.d/ironic.yml b/inventory/env.d/ironic.yml index f5a92c061a..bb4917c00a 100644 --- a/inventory/env.d/ironic.yml +++ b/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 diff --git a/inventory/inventory.ini b/inventory/inventory.ini index ddfa0b3b9c..2a64d07aa3 100644 --- a/inventory/inventory.ini +++ b/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] diff --git a/tests/test_inventory.py b/tests/test_inventory.py index d32597a485..528a23d9da 100644 --- a/tests/test_inventory.py +++ b/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',