From c2bd891405c6250bc4e3c3a823dfbe084198dde1 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 21 Nov 2023 21:39:13 +0000
Subject: [PATCH] Move [oslo_policy] back inside Jinja if block
This avoids generating an empty [oslo_policy] section in nova.conf when
no custom policy file is defined.
Change-Id: I23fae8387573e7f37eda0f2a09cd937239afd93f
---
ansible/roles/nova/templates/nova.conf.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 49646f8826..b7a4fbf058 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -148,8 +148,8 @@ ssl_ca_file = {{ om_rabbitmq_cacert }}
amqp_durable_queues = true
{% endif %}
-[oslo_policy]
{% if service_name in nova_services_require_policy_json and nova_policy_file is defined %}
+[oslo_policy]
policy_file = {{ nova_policy_file }}
{% endif %}