openstack/openstack-ansible
Code Issues Proposed changes

Remove ironic_server from env.d

Browse Source 
Nothing references this group, and it is empty in a deployment
running the ironic service

Change-Id: I66b0bd17ec8fb8404ddeef66c4f9b0f54b832b36
This commit is contained in:
Jonathan Rosser 2022-08-04 16:26:50 +01:00
parent 93b35e0b68
commit 8530ed089a
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/openstack_deploy/env.d/aio_metal.yml.example
View File

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

15
inventory/env.d/ironic.yml
View File

@ -21,10 +21,6 @@ component_skel:
ironic_conductor: ironic_conductor:
belongs_to: belongs_to:
- ironic_all - ironic_all
ironic_server:
belongs_to:
- ironic_all
- ironic_servers
ironic_compute: ironic_compute:
belongs_to: belongs_to:
- nova_all - nova_all
@ -39,11 +35,6 @@ container_skel:
contains: contains:
- ironic_api - ironic_api
- ironic_conductor - ironic_conductor
ironic_server_container:
belongs_to:
- ironic-server_containers
contains:
- ironic_server
properties: properties:
is_metal: true is_metal: true
ironic_compute_container: ironic_compute_container:
@ -70,12 +61,6 @@ physical_skel:
ironic-infra_hosts: ironic-infra_hosts:
belongs_to: belongs_to:
- hosts - hosts
ironic-server_containers:
belongs_to:
- all_containers
ironic-server_hosts:
belongs_to:
- hosts
ironic-compute_containers: ironic-compute_containers:
belongs_to: belongs_to:
- all_containers - all_containers

2
inventory/inventory.ini
View File

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

5
tests/test_inventory.py
View File

@ -256,15 +256,10 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'ironic-infra_all', 'ironic-infra_all',
'ironic-infra_containers', 'ironic-infra_containers',
'ironic-infra_hosts', 'ironic-infra_hosts',
'ironic-server_containers',
'ironic-server_hosts',
'ironic_all', 'ironic_all',
'ironic_api', 'ironic_api',
'ironic_api_container', 'ironic_api_container',
'ironic_conductor', 'ironic_conductor',
'ironic_server',
'ironic_server_container',
'ironic_servers',
'ironic_compute', 'ironic_compute',
'ironic_compute_container', 'ironic_compute_container',
'ironic-compute_containers', 'ironic-compute_containers',