From 6460e97088d399a9280548355c25debed84c5dca Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 22 Jan 2025 16:44:10 +0100
Subject: [PATCH] Remove deleted nova option [api] use_forwarded_for

This option was deleted from Nova in the 2024.1 release [1].

[1] https://review.opendev.org/c/openstack/nova/+/903339

Change-Id: I26827322199365a4466f180a1abba50ca6a1515f
---
 ansible/roles/nova/templates/nova.conf.j2                    | 4 +---
 .../nova-remove-use-forwarded-for-69f98132b0f164c1.yaml      | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/nova-remove-use-forwarded-for-69f98132b0f164c1.yaml

diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 96c11f4ad3..8ebfc8664b 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -40,10 +40,8 @@ enabled_filters = ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter
 track_instance_changes = False
 {% endif %}
 
-[api]
-use_forwarded_for = true
-
 {% if vendordata_file_path is defined %}
+[api]
 vendordata_jsonfile_path = /etc/nova/vendordata.json
 {% endif %}
 
diff --git a/releasenotes/notes/nova-remove-use-forwarded-for-69f98132b0f164c1.yaml b/releasenotes/notes/nova-remove-use-forwarded-for-69f98132b0f164c1.yaml
new file mode 100644
index 0000000000..3e6508feba
--- /dev/null
+++ b/releasenotes/notes/nova-remove-use-forwarded-for-69f98132b0f164c1.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Removes the Nova configuration option ``[api] use_forwarded_for``. This
+    option was deleted from Nova in the 2024.1 release.