Skip to content

Commit

Permalink
Change set_os_workload_status(...) call to assess_status(...) call in…
Browse files Browse the repository at this point in the history
… hooks/keystone_hooks.py:main

This is so that invoking keystone_hooks.py directly doesn't clobber a user set paused state.
  • Loading branch information
ajkavanagh committed Jan 14, 2016
1 parent 86c7018 commit 85b3723
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions hooks/keystone_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
git_install_requested,
openstack_upgrade_available,
sync_db_with_multi_ipv6_addresses,
set_os_workload_status,
)

from keystone_utils import (
Expand Down Expand Up @@ -82,8 +81,7 @@
force_ssl_sync,
filter_null,
ensure_ssl_dirs,
REQUIRED_INTERFACES,
check_optional_relations,
assess_status,
)

from charmhelpers.contrib.hahelpers.cluster import (
Expand Down Expand Up @@ -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__':
Expand Down

0 comments on commit 85b3723

Please sign in to comment.