openstack/charm-keystone
Code Issues Proposed changes

hooks: remove our pointless identity-admin-relation-joined hook

Browse Source 
and its inspiration, identity-service-relation-joined
This commit is contained in:
Paul Collins 2014-06-25 17:17:36 +12:00
parent 098551e0df
commit 18d917ed27
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hooks/identity-admin-relation-joined
View File

@ -1 +0,0 @@
keystone_hooks.py

1
hooks/identity-service-relation-joined
View File

@ -1 +0,0 @@
keystone_hooks.py

12
hooks/keystone_hooks.py
View File

@ -163,12 +163,6 @@ def pgsql_db_changed():
identity_changed(relation_id=rid, remote_unit=unit) identity_changed(relation_id=rid, remote_unit=unit)
@hooks.hook('identity-service-relation-joined')
def identity_joined():
""" Do nothing until we get information about requested service """
pass
@hooks.hook('identity-service-relation-changed') @hooks.hook('identity-service-relation-changed')
def identity_changed(relation_id=None, remote_unit=None): def identity_changed(relation_id=None, remote_unit=None):
if eligible_leader(CLUSTER_RES): if eligible_leader(CLUSTER_RES):
@ -243,12 +237,6 @@ def ha_changed():
service_host=config('vip')) service_host=config('vip'))
@hooks.hook('identity-admin-relation-joined')
def admin_relation_joined():
""" Do nothing until we get information about requested service """
pass
@hooks.hook('identity-admin-relation-changed') @hooks.hook('identity-admin-relation-changed')
def admin_relation_changed(): def admin_relation_changed():
relation_data = { relation_data = {