openstack/charm-glance
Code Issues Proposed changes

Drop glance-registry from restart_map as of stein

Browse Source 
This aligns with upstream's removal of glance-registry in the
stein release.

Change-Id: Ie6d618582cd5063738a965d36e7d766633e1a607
This commit is contained in:
Corey Bryant 2019-02-26 10:45:04 +00:00
parent 6e6b492485
commit 3d566f7762
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hooks/glance_utils.py
View File

@ -351,9 +351,13 @@ def restart_map():
that should be restarted when file changes. that should be restarted when file changes.
''' '''
_map = [] _map = []
cmp_release = CompareOpenStackReleases(os_release('glance-common'))
for f, ctxt in CONFIG_FILES.items(): for f, ctxt in CONFIG_FILES.items():
svcs = [] svcs = []
for svc in ctxt['services']: for svc in ctxt['services']:
if cmp_release >= 'stein' and svc == 'glance-registry':
continue
svcs.append(svc) svcs.append(svc)
if svcs: if svcs:
_map.append((f, svcs)) _map.append((f, svcs))
@ -361,7 +365,10 @@ def restart_map():
if enable_memcache(source=config('openstack-origin')): if enable_memcache(source=config('openstack-origin')):
_map.append((MEMCACHED_CONF, ['memcached'])) _map.append((MEMCACHED_CONF, ['memcached']))
_map.append((GLANCE_POLICY_FILE, ['glance-api', 'glance-registry'])) if cmp_release >= 'stein':
_map.append((GLANCE_POLICY_FILE, ['glance-api']))
else:
_map.append((GLANCE_POLICY_FILE, ['glance-api', 'glance-registry']))
return OrderedDict(_map) return OrderedDict(_map)

24
unit_tests/test_glance_utils.py
View File

@ -140,10 +140,11 @@ class TestGlanceUtils(CharmTestCase):
) )
configs.register.assert_has_calls(calls, any_order=True) configs.register.assert_has_calls(calls, any_order=True)
def test_restart_map(self): def test_restart_map_rocky(self):
self.enable_memcache.return_value = True self.enable_memcache.return_value = True
self.config.side_effect = None self.config.side_effect = None
self.service_name.return_value = 'glance' self.service_name.return_value = 'glance'
self.os_release.return_value = 'rocky'
ex_map = OrderedDict([ ex_map = OrderedDict([
(utils.GLANCE_REGISTRY_CONF, ['glance-registry']), (utils.GLANCE_REGISTRY_CONF, ['glance-registry']),
@ -161,6 +162,27 @@ class TestGlanceUtils(CharmTestCase):
del ex_map[utils.MEMCACHED_CONF] del ex_map[utils.MEMCACHED_CONF]
self.assertEqual(ex_map, utils.restart_map()) self.assertEqual(ex_map, utils.restart_map())
def test_restart_map_stein(self):
self.enable_memcache.return_value = True
self.config.side_effect = None
self.service_name.return_value = 'glance'
self.os_release.return_value = 'stein'
ex_map = OrderedDict([
(utils.GLANCE_API_CONF, ['glance-api']),
(utils.GLANCE_SWIFT_CONF, ['glance-api']),
(utils.ceph_config_file(), ['glance-api']),
(utils.HAPROXY_CONF, ['haproxy']),
(utils.HTTPS_APACHE_CONF, ['apache2']),
(utils.HTTPS_APACHE_24_CONF, ['apache2']),
(utils.MEMCACHED_CONF, ['memcached']),
(utils.GLANCE_POLICY_FILE, ['glance-api']),
])
self.assertEqual(ex_map, utils.restart_map())
self.enable_memcache.return_value = False
del ex_map[utils.MEMCACHED_CONF]
self.assertEqual(ex_map, utils.restart_map())
@patch.object(utils, 'token_cache_pkgs') @patch.object(utils, 'token_cache_pkgs')
def test_determine_packages(self, token_cache_pkgs): def test_determine_packages(self, token_cache_pkgs):
self.config.side_effect = None self.config.side_effect = None