openstack/charm-keystone
Code Issues Proposed changes

Remove uneccessary calls from update_all_identity_relation_units

Browse Source 
On every call to update_all_identity_relation_units()
apache was reconfigured and all configuration files written.

This was used for the legacy management of self signed
certificates which now has been removed.

Change-Id: I7480575bc06287f6898ce469b420fd63206015e2
This commit is contained in:
Frode Nordahl 2018-06-28 09:40:55 +02:00
parent d7348a532a
commit e519e2d3b1
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/keystone_hooks.py
View File

@ -263,8 +263,6 @@ def db_joined():
def update_all_identity_relation_units(check_db_ready=True):
if is_unit_paused_set():
return
CONFIGS.write_all()
configure_https()
if check_db_ready and not is_db_ready():
log('Allowed_units list provided and this unit not present',
level=INFO)

5
unit_tests/test_keystone_hooks.py
View File

@ -770,7 +770,6 @@ class KeystoneRelationTests(CharmTestCase):
call('Firing identity_credentials_changed hook for all '
'related services.')]
hooks.update_all_identity_relation_units(check_db_ready=False)
self.assertTrue(configs.write_all.called)
identity_changed.assert_called_with(
relation_id='identity-relation:0',
remote_unit='unit/0')
@ -786,7 +785,6 @@ class KeystoneRelationTests(CharmTestCase):
""" Verify update identity relations when DB is not ready """
self.is_db_ready.return_value = False
hooks.update_all_identity_relation_units(check_db_ready=True)
self.assertTrue(configs.write_all.called)
self.assertTrue(self.is_db_ready.called)
self.log.assert_called_with('Allowed_units list provided and this '
'unit not present', level='INFO')
@ -800,7 +798,6 @@ class KeystoneRelationTests(CharmTestCase):
""" Verify update identity relations when DB is not initialized """
is_db_initialized.return_value = False
hooks.update_all_identity_relation_units(check_db_ready=False)
self.assertTrue(configs.write_all.called)
self.assertFalse(self.is_db_ready.called)
self.log.assert_called_with('Database not yet initialised - '
'deferring identity-relation updates',
@ -816,7 +813,6 @@ class KeystoneRelationTests(CharmTestCase):
self.is_elected_leader.return_value = True
is_db_initialized.return_value = True
hooks.update_all_identity_relation_units(check_db_ready=False)
self.assertTrue(configs.write_all.called)
self.assertTrue(self.ensure_initial_admin.called)
# Still updates relations
self.assertTrue(self.relation_ids.called)
@ -830,7 +826,6 @@ class KeystoneRelationTests(CharmTestCase):
self.is_elected_leader.return_value = False
is_db_initialized.return_value = True
hooks.update_all_identity_relation_units(check_db_ready=False)
self.assertTrue(configs.write_all.called)
self.assertFalse(self.ensure_initial_admin.called)
# Still updates relations
self.assertTrue(self.relation_ids.called)