From cf1b3a73aee1889bc9865275bbf2a6062293e751 Mon Sep 17 00:00:00 2001
From: Dincer Celik <hello@dincercelik.com>
Date: Tue, 15 Oct 2019 11:34:42 +0300
Subject: [PATCH] Fixes glance image cache deployment.

Deployment fails because the variable "glance_registry_port" in
"ansible/roles/glance/templates/glance-cache.conf.j2" hasn't been configured
anywhere.

Also, "registry_host" and "registry_port" were deprecated since Queens[1], so
they should be removed.

[1] https://specs.openstack.org/openstack/glance-specs/specs/queens/approved/glance/deprecate-registry.html

Closes-Bug: #1848146

Change-Id: I3dd5f5d2ba73d491366791986fdbdf16b75538ef
---
 ansible/roles/glance/templates/glance-cache.conf.j2 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ansible/roles/glance/templates/glance-cache.conf.j2 b/ansible/roles/glance/templates/glance-cache.conf.j2
index 77b3591e25..9e3275399f 100644
--- a/ansible/roles/glance/templates/glance-cache.conf.j2
+++ b/ansible/roles/glance/templates/glance-cache.conf.j2
@@ -11,9 +11,6 @@ admin_password = {{ glance_keystone_password }}
 admin_user = {{ glance_keystone_user }}
 admin_tenant_name = {{ default_project_domain_id }}
 
-registry_host = {{ api_interface_address }}
-registry_port = {{ glance_registry_port }}
-
 {% if glance_backend_file | bool %}
 filesystem_store_datadir = /var/lib/glance/images/
 {% endif %}