From ce71db967a7497469fa86b1e7f6af635c7b83bd0 Mon Sep 17 00:00:00 2001
From: Balazs Gibizer <gibi@redhat.com>
Date: Mon, 14 Oct 2024 16:39:07 +0200
Subject: [PATCH] Kolla config cleanup

The nova-cellx-manage-config-data secret does not have any
config override added. So the jobs using this secret does not need a
02-nova-override.conf in their kolla config as that file will never be
present.

Note that the cell level dbsync and dbpurge jobs get
02-nova-override.conf based on the customServiceConfig from the relevant
NovaConductor CR, so there the kolla config is kept.
---
 templates/nova-manage/config/cell-delete-config.json   | 7 -------
 templates/nova-manage/config/cell-mapping-config.json  | 7 -------
 templates/nova-manage/config/host-discover-config.json | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/templates/nova-manage/config/cell-delete-config.json b/templates/nova-manage/config/cell-delete-config.json
index 955ea4ca2..9fb5bbc55 100644
--- a/templates/nova-manage/config/cell-delete-config.json
+++ b/templates/nova-manage/config/cell-delete-config.json
@@ -13,13 +13,6 @@
             "owner": "nova",
             "perm": "0600"
         },
-        {
-            "source": "/var/lib/openstack/config/02-nova-override.conf",
-            "dest": "/etc/nova/nova.conf.d/02-nova-override.conf",
-            "owner": "nova",
-            "perm": "0600",
-            "optional": true
-        },
         {
             "source": "/var/lib/openstack/bin/delete_cell.sh",
             "dest": "/bin/",
diff --git a/templates/nova-manage/config/cell-mapping-config.json b/templates/nova-manage/config/cell-mapping-config.json
index eed9b0aa8..c58fa7925 100644
--- a/templates/nova-manage/config/cell-mapping-config.json
+++ b/templates/nova-manage/config/cell-mapping-config.json
@@ -13,13 +13,6 @@
             "owner": "nova",
             "perm": "0600"
         },
-        {
-            "source": "/var/lib/openstack/config/02-nova-override.conf",
-            "dest": "/etc/nova/nova.conf.d/02-nova-override.conf",
-            "owner": "nova",
-            "perm": "0600",
-            "optional": true
-        },
         {
             "source": "/var/lib/openstack/bin/ensure_cell_mapping.sh",
             "dest": "/bin/",
diff --git a/templates/nova-manage/config/host-discover-config.json b/templates/nova-manage/config/host-discover-config.json
index 893681978..06d000c51 100644
--- a/templates/nova-manage/config/host-discover-config.json
+++ b/templates/nova-manage/config/host-discover-config.json
@@ -13,13 +13,6 @@
             "owner": "nova",
             "perm": "0600"
         },
-        {
-            "source": "/var/lib/openstack/config/02-nova-override.conf",
-            "dest": "/etc/nova/nova.conf.d/02-nova-override.conf",
-            "owner": "nova",
-            "perm": "0600",
-            "optional": true
-        },
         {
             "source": "/var/lib/openstack/bin/host_discover.sh",
             "dest": "/bin/",