diff --git a/hooks/keystone_hooks.py b/hooks/keystone_hooks.py index c6b85a79..b827653e 100755 --- a/hooks/keystone_hooks.py +++ b/hooks/keystone_hooks.py @@ -47,7 +47,6 @@ from charmhelpers.contrib.openstack.utils import ( git_install_requested, openstack_upgrade_available, sync_db_with_multi_ipv6_addresses, - set_os_workload_status, ) from keystone_utils import ( @@ -82,8 +81,7 @@ from keystone_utils import ( force_ssl_sync, filter_null, ensure_ssl_dirs, - REQUIRED_INTERFACES, - check_optional_relations, + assess_status, ) from charmhelpers.contrib.hahelpers.cluster import ( @@ -649,8 +647,7 @@ def main(): hooks.execute(sys.argv) except UnregisteredHookError as e: log('Unknown hook {} - skipping.'.format(e)) - set_os_workload_status(CONFIGS, REQUIRED_INTERFACES, - charm_func=check_optional_relations) + assess_status(CONFIGS) if __name__ == '__main__':