openstack
/
charm-keystone
Code Issues Proposed changes

Change set_os_workload_status(...) call to assess_status(...) call in hooks/keystone_hooks.py:main 

This is so that invoking keystone_hooks.py directly doesn't clobber a user set paused state.
This commit is contained in:
Alex Kavanagh 2016-01-14 11:31:23 +00:00
parent e61a9a8d13
commit e5c16e5fb6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/keystone_hooks.py
View File

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