From 6775f57c75c7be25ebd7cc0a12fb41027908ac93 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Wed, 9 Feb 2022 08:55:17 +0200
Subject: [PATCH] Drop nova_glance_api_servers variable

Since api_servers from [glance] secton is deprecated and can be
silently ignored [1], we drop corresponsive OSA variable

[1] https://docs.openstack.org/nova/latest/configuration/config.html#glance.api_servers

Change-Id: I52de65a4629f23fd2c0c3735033a8e2d57a82024
---
 defaults/main.yml                                            | 3 ---
 .../notes/deprecate_glance_api_servers-6a5fd6a13d324fb4.yaml | 5 +++++
 templates/nova.conf.j2                                       | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/deprecate_glance_api_servers-6a5fd6a13d324fb4.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index 63269b50..a2922672 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -300,9 +300,6 @@ nova_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
 ## Nova global config
 nova_image_cache_manager_interval: 0
 
-# Comma separated list of Glance API servers
-nova_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | urlsplit('scheme') ~ '://' ~ (glance_service_internalurl | default('http://localhost')) | urlsplit('netloc') }}"
-
 nova_network_type: linuxbridge
 
 nova_network_services:
diff --git a/releasenotes/notes/deprecate_glance_api_servers-6a5fd6a13d324fb4.yaml b/releasenotes/notes/deprecate_glance_api_servers-6a5fd6a13d324fb4.yaml
new file mode 100644
index 00000000..b3fab6a0
--- /dev/null
+++ b/releasenotes/notes/deprecate_glance_api_servers-6a5fd6a13d324fb4.yaml
@@ -0,0 +1,5 @@
+---
+deprecations:
+  - |
+    Variable ``nova_glance_api_servers`` has been removed and has no effect
+    due to corresponsive upstream api_servers being deprecated.
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 3dd51e3c..8634321b 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -128,7 +128,6 @@ enabled = False
 
 # Glance
 [glance]
-api_servers = {{ nova_glance_api_servers }}
 insecure = {{ keystone_service_internaluri_insecure | bool }}
 
 # Neutron