From f79e491930f0c9a9a86578de02e167fba111ed1e Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 15 Jul 2024 17:09:31 +0200
Subject: [PATCH] kolla-openstack: Add ironic-inspector dir to config

Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/923946
Change-Id: Icd6988668646e0ecb89822d46dafa33f9dd618e1
---
 ansible/roles/kolla-openstack/defaults/main.yml           | 2 ++
 doc/source/configuration/reference/kolla-ansible.rst      | 1 +
 ...default-kolla-config-directories-0cabe2c52feb5907.yaml | 8 ++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/adds-ironic-inspector-to-default-kolla-config-directories-0cabe2c52feb5907.yaml

diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index 895b12737..8cd251cb4 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -94,6 +94,8 @@ kolla_openstack_custom_config_include_globs_default:
     glob: influx*
   - enabled: '{{ kolla_enable_ironic | bool }}'
     glob: ironic-inspector.conf
+  - enabled: '{{ kolla_enable_ironic | bool }}'
+    glob: ironic-inspector/**
   - enabled: '{{ kolla_enable_ironic | bool }}'
     glob: ironic.conf
   - enabled: '{{ kolla_enable_ironic | bool }}'
diff --git a/doc/source/configuration/reference/kolla-ansible.rst b/doc/source/configuration/reference/kolla-ansible.rst
index 92358647c..be35761a3 100644
--- a/doc/source/configuration/reference/kolla-ansible.rst
+++ b/doc/source/configuration/reference/kolla-ansible.rst
@@ -722,6 +722,7 @@ which files are supported.
    ``horizon/*``                   Extended horizon configuration.
    ``influx*``                     InfluxDB configuration.
    ``ironic-inspector.conf``       Ironic inspector configuration.
+   ``ironic-inspector/*``          Extended Ironic inspector configuration
    ``ironic.conf``                 Ironic configuration.
    ``ironic/*``                    Extended ironic configuration.
    ``keepalived/*``                Extended keepalived configuration.
diff --git a/releasenotes/notes/adds-ironic-inspector-to-default-kolla-config-directories-0cabe2c52feb5907.yaml b/releasenotes/notes/adds-ironic-inspector-to-default-kolla-config-directories-0cabe2c52feb5907.yaml
new file mode 100644
index 000000000..313b3e6da
--- /dev/null
+++ b/releasenotes/notes/adds-ironic-inspector-to-default-kolla-config-directories-0cabe2c52feb5907.yaml
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Ironic Inspector configuration can now be customised by placing config
+    overrides in the ``$KAYOBE_CONFIG_PATH/kolla/config/ironic-inspector`` or
+    ``$KAYOBE_CONFIG_PATH/environments/<environment>/kolla/config/ironic-inspector``
+    directories. This can be used to a define a ``known_devices.yaml`` file
+    which is used to configure the ``accelerators`` plugin in Ironic Inspector.