From 339c8fc04f711cc1751a15029276047c37757baf Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Thu, 2 Jul 2020 10:35:13 +0200
Subject: [PATCH] Stop using glance-registry service

glance-registry was deprecated some releases ago and it has been fially
removed in Victoria [1].

This patch stop deploying glance-registry service.

[1] https://review.opendev.org/#/c/738671/

Change-Id: If56beeb503033149115138150b0a865a2d519321
---
 .../modules/packstack/manifests/glance.pp     | 24 +------------------
 ...move-glance-registry-6076539ab6ce1a8b.yaml |  5 ++++
 2 files changed, 6 insertions(+), 23 deletions(-)
 create mode 100644 releasenotes/notes/remove-glance-registry-6076539ab6ce1a8b.yaml

diff --git a/packstack/puppet/modules/packstack/manifests/glance.pp b/packstack/puppet/modules/packstack/manifests/glance.pp
index db061d406..5b9c6a6ea 100644
--- a/packstack/puppet/modules/packstack/manifests/glance.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance.pp
@@ -12,12 +12,7 @@ class packstack::glance ()
       default => '0.0.0.0',
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
-    # magical hack for magical config - glance option registry_host requires brackets
-    $registry_host = hiera('CONFIG_IP_VERSION') ? {
-      'ipv6'  => '[::0]',
-      default => '0.0.0.0',
-      # TO-DO(mmagr): Add IPv6 support when hostnames are used
-    }
+
     $default_store = hiera('CONFIG_GLANCE_BACKEND') ? {
       'swift' => 'swift',
       default => 'file',
@@ -35,27 +30,10 @@ class packstack::glance ()
 
     class { '::glance::api':
       bind_host           => $bind_host,
-      registry_host       => $registry_host,
       pipeline            => 'keystone',
       database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
       workers             => hiera('CONFIG_SERVICE_WORKERS'),
       stores              => ['file', 'http', 'swift'],
       default_store       => $default_store,
     }
-
-    class { '::glance::registry::authtoken':
-      www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
-      auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
-      password             => hiera('CONFIG_GLANCE_KS_PW'),
-    }
-
-    class { '::glance::registry::logging':
-      debug => hiera('CONFIG_DEBUG_MODE'),
-    }
-
-    class { '::glance::registry':
-      bind_host           => $bind_host,
-      database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
-      workers             => hiera('CONFIG_SERVICE_WORKERS'),
-    }
 }
diff --git a/releasenotes/notes/remove-glance-registry-6076539ab6ce1a8b.yaml b/releasenotes/notes/remove-glance-registry-6076539ab6ce1a8b.yaml
new file mode 100644
index 000000000..c96ae43e3
--- /dev/null
+++ b/releasenotes/notes/remove-glance-registry-6076539ab6ce1a8b.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Glance Registry service was deprecated in the Queens release and has been removed in Victoria.
+    Accordingly, packstack is not longer deploying glance-registry.