sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove glance-registry"

Browse Source
This commit is contained in:
Zuul 2020-08-18 08:12:17 +00:00 committed by Gerrit Code Review
commit e1995088af
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/svc-map/README.rst
View File

@ -55,9 +55,6 @@ Provides the following:
glance-api: glance-api:
debian: glance-api debian: glance-api
default: openstack-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:: If the distro is of the debian family the combined services file would be::

8
diskimage_builder/elements/svc-map/tests/test_data_merge.py
View File

@ -50,10 +50,6 @@ class TestDataMerge(base.BaseTestCase):
u'debian': u'glance-api', u'debian': u'glance-api',
u'default': u'openstack-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 = { cinder_api_services = {
@ -84,7 +80,6 @@ class TestDataMerge(base.BaseTestCase):
u'nova-conductor': u'openstack-nova-conductor', u'nova-conductor': u'openstack-nova-conductor',
u'nova-consoleauth': u'openstack-nova-console', u'nova-consoleauth': u'openstack-nova-console',
u'glance-api': u'openstack-glance-api', u'glance-api': u'openstack-glance-api',
u'glance-reg': u'openstack-glance-registry'
} }
fedora_nova_glance_cinder_services = { fedora_nova_glance_cinder_services = {
@ -94,7 +89,6 @@ class TestDataMerge(base.BaseTestCase):
u'nova-conductor': u'openstack-nova-conductor', u'nova-conductor': u'openstack-nova-conductor',
u'nova-consoleauth': u'openstack-nova-console', u'nova-consoleauth': u'openstack-nova-console',
u'glance-api': u'openstack-glance-api', u'glance-api': u'openstack-glance-api',
u'glance-reg': u'openstack-glance-registry',
u'cinder-api': u'openstack-cinder-api', u'cinder-api': u'openstack-cinder-api',
u'cinder-scheduler': u'openstack-cinder-scheduler', u'cinder-scheduler': u'openstack-cinder-scheduler',
} }
@ -140,7 +134,6 @@ class TestDataMerge(base.BaseTestCase):
u'nova-conductor': u'nova-conductor', u'nova-conductor': u'nova-conductor',
u'nova-consoleauth': u'nova-console', u'nova-consoleauth': u'nova-console',
u'glance-api': u'glance-api', u'glance-api': u'glance-api',
u'glance-reg': u'glance-reg'
} }
ubuntu_nova_glance_cinder_services = { ubuntu_nova_glance_cinder_services = {
@ -150,7 +143,6 @@ class TestDataMerge(base.BaseTestCase):
u'nova-conductor': u'nova-conductor', u'nova-conductor': u'nova-conductor',
u'nova-consoleauth': u'nova-console', u'nova-consoleauth': u'nova-console',
u'glance-api': u'glance-api', u'glance-api': u'glance-api',
u'glance-reg': u'glance-reg',
u'cinder-api': u'cinder-api', u'cinder-api': u'cinder-api',
u'cinder-scheduler': u'cinder-scheduler' u'cinder-scheduler': u'cinder-scheduler'
} }