From ae08dc8902d748073b4fdf3b0a95c79e0fd24e8a Mon Sep 17 00:00:00 2001
From: gugug <gu.jin@99cloud.net>
Date: Tue, 7 Jul 2020 23:24:43 +0800
Subject: [PATCH] Remove glance-registry

glance-registry service was deprecated in Queens release and has been
removed in Victoria [1].

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

Change-Id: Id2dfc3455b377b885521556f37f4b0f2da197655
---
 diskimage_builder/elements/svc-map/README.rst             | 3 ---
 .../elements/svc-map/tests/test_data_merge.py             | 8 --------
 2 files changed, 11 deletions(-)

diff --git a/diskimage_builder/elements/svc-map/README.rst b/diskimage_builder/elements/svc-map/README.rst
index ba075f11..8cef9c47 100644
--- a/diskimage_builder/elements/svc-map/README.rst
+++ b/diskimage_builder/elements/svc-map/README.rst
@@ -55,9 +55,6 @@ Provides the following:
       glance-api:
         debian: glance-api
         default: openstack-glance-api
-      glance-reg:
-        debian: glance-reg
-        default: openstack-glance-registry
 
 
     If the distro is of the debian family the combined services file would be::
diff --git a/diskimage_builder/elements/svc-map/tests/test_data_merge.py b/diskimage_builder/elements/svc-map/tests/test_data_merge.py
index df2dc2ed..2e016a8c 100644
--- a/diskimage_builder/elements/svc-map/tests/test_data_merge.py
+++ b/diskimage_builder/elements/svc-map/tests/test_data_merge.py
@@ -50,10 +50,6 @@ class TestDataMerge(base.BaseTestCase):
             u'debian': u'glance-api',
             u'default': u'openstack-glance-api'
         },
-        u'glance-reg': {
-            u'debian': u'glance-reg',
-            u'default': u'openstack-glance-registry'
-        }
     }
 
     cinder_api_services = {
@@ -84,7 +80,6 @@ class TestDataMerge(base.BaseTestCase):
             u'nova-conductor': u'openstack-nova-conductor',
             u'nova-consoleauth': u'openstack-nova-console',
             u'glance-api': u'openstack-glance-api',
-            u'glance-reg': u'openstack-glance-registry'
         }
 
         fedora_nova_glance_cinder_services = {
@@ -94,7 +89,6 @@ class TestDataMerge(base.BaseTestCase):
             u'nova-conductor': u'openstack-nova-conductor',
             u'nova-consoleauth': u'openstack-nova-console',
             u'glance-api': u'openstack-glance-api',
-            u'glance-reg': u'openstack-glance-registry',
             u'cinder-api': u'openstack-cinder-api',
             u'cinder-scheduler': u'openstack-cinder-scheduler',
         }
@@ -140,7 +134,6 @@ class TestDataMerge(base.BaseTestCase):
             u'nova-conductor': u'nova-conductor',
             u'nova-consoleauth': u'nova-console',
             u'glance-api': u'glance-api',
-            u'glance-reg': u'glance-reg'
         }
 
         ubuntu_nova_glance_cinder_services = {
@@ -150,7 +143,6 @@ class TestDataMerge(base.BaseTestCase):
             u'nova-conductor': u'nova-conductor',
             u'nova-consoleauth': u'nova-console',
             u'glance-api': u'glance-api',
-            u'glance-reg': u'glance-reg',
             u'cinder-api': u'cinder-api',
             u'cinder-scheduler': u'cinder-scheduler'
         }