x/microstack
Code Issues Proposed changes

Drop glance-registry

Browse Source 
Glance-registry has been deprecated since Queens and were removed
from the upstream source in Train.

Change-Id: Ia993bfce039cd46ced3442c9064e4af8547fa54f
This commit is contained in:
Corey Bryant 2021-03-11 11:55:37 -05:00
parent c853b3e8c8
commit 1f30e10b5b
4 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snap-overlay/snap-openstack.yaml
View File

@ -270,14 +270,6 @@ entry_points:
- "{snap_common}/etc/glance/glance-manage.conf" - "{snap_common}/etc/glance/glance-manage.conf"
config-dirs: config-dirs:
- "{snap_common}/etc/glance/glance.conf.d" - "{snap_common}/etc/glance/glance.conf.d"
glance-registry:
binary: "{snap}/bin/glance-registry"
config-files:
- "{snap}/etc/glance/glance-registry.conf"
config-files-override:
- "{snap_common}/etc/glance/glance-registry.conf"
config-dirs:
- "{snap_common}/etc/glance/glance.conf.d"
glance-api: glance-api:
binary: "{snap}/bin/glance-api" binary: "{snap}/bin/glance-api"
config-files: config-files:

1
snap/hooks/install
View File

@ -29,7 +29,6 @@ snapctl stop --disable $SNAP_INSTANCE_NAME.horizon-uwsgi
snapctl stop --disable $SNAP_INSTANCE_NAME.neutron-api snapctl stop --disable $SNAP_INSTANCE_NAME.neutron-api
snapctl stop --disable $SNAP_INSTANCE_NAME.glance-api snapctl stop --disable $SNAP_INSTANCE_NAME.glance-api
snapctl stop --disable $SNAP_INSTANCE_NAME.registry
snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-uwsgi snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-uwsgi
snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-scheduler snapctl stop --disable $SNAP_INSTANCE_NAME.cinder-scheduler

8
snapcraft.yaml
View File

@ -223,14 +223,6 @@ apps:
- mount-observe - mount-observe
- network-control - network-control
# TODO: - microstack-support # TODO: - microstack-support
registry:
command: bin/snap-openstack launch glance-registry
daemon: simple
plugs:
- network
- network-bind
- network-control
# TODO: - microstack-support
glance-manage: glance-manage:
command: bin/snap-openstack launch glance-manage command: bin/snap-openstack launch glance-manage
plugs: plugs:

9
tools/init/init/questions/__init__.py
View File

@ -867,13 +867,7 @@ class GlanceSetup(Question):
'http://{compute_ip}:9292'.format(**_env)) 'http://{compute_ip}:9292'.format(**_env))
check('snap-openstack', 'launch', 'glance-manage', 'db_sync') check('snap-openstack', 'launch', 'glance-manage', 'db_sync')
# TODO: remove the glance registry enable('glance-api')
# https://blueprints.launchpad.net/glance/+spec/deprecate-registry
for service in [
'glance-api',
'registry',
]:
enable(service)
nc_wait(_env['compute_ip'], '9292') nc_wait(_env['compute_ip'], '9292')
@ -883,7 +877,6 @@ class GlanceSetup(Question):
def no(self, answer): def no(self, answer):
disable('glance-api') disable('glance-api')
disable('registry')
class SecurityRules(Question): class SecurityRules(Question):