Juju Charms Collection
keystone package

Merge lp:~thedac/charms/trusty/keystone/status-every-hook into lp:~openstack-charmers-archive/charms/trusty/keystone/next

  1. Trusty Tahr (14.04)
  2. status-every-hook
  3. Merge into next
Proposed by David Ames
Status: Merged
Merged at revision: 186
Proposed branch: lp:~thedac/charms/trusty/keystone/status-every-hook
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 93 lines (+3/-17)
1 file modified
hooks/keystone_hooks.py (+3/-17)
To merge this branch: bzr merge lp:~thedac/charms/trusty/keystone/status-every-hook
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+273736@code.launchpad.net

Description of the change

Run set_os_workload_status after every hook

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #11491 keystone-next for thedac mp273736
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11491/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #10685 keystone-next for thedac mp273736
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10685/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7195 keystone-next for thedac mp273736
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7195/

lp:~thedac/charms/trusty/keystone/status-every-hook updated
187. By David Ames

Run even on unknown hook

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #11500 keystone-next for thedac mp273736
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11500/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #10692 keystone-next for thedac mp273736
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10692/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #7204 keystone-next for thedac mp273736
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7204/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py 2015-09-30 07:01:00 +0000
+++ hooks/keystone_hooks.py 2015-10-07 20:46:58 +0000
@@ -47,7 +47,7 @@
47 git_install_requested,47 git_install_requested,
48 openstack_upgrade_available,48 openstack_upgrade_available,
49 sync_db_with_multi_ipv6_addresses,49 sync_db_with_multi_ipv6_addresses,
50 os_workload_status,50 set_os_workload_status,
51)51)
5252
53from keystone_utils import (53from keystone_utils import (
@@ -117,8 +117,6 @@
117117
118118
119@hooks.hook('install.real')119@hooks.hook('install.real')
120@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
121 charm_func=check_optional_relations)
122def install():120def install():
123 status_set('maintenance', 'Executing pre-install')121 status_set('maintenance', 'Executing pre-install')
124 execd_preinstall()122 execd_preinstall()
@@ -132,8 +130,6 @@
132130
133131
134@hooks.hook('config-changed')132@hooks.hook('config-changed')
135@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
136 charm_func=check_optional_relations)
137@restart_on_change(restart_map())133@restart_on_change(restart_map())
138@synchronize_ca_if_changed(fatal=True)134@synchronize_ca_if_changed(fatal=True)
139def config_changed():135def config_changed():
@@ -210,8 +206,6 @@
210206
211207
212@hooks.hook('shared-db-relation-joined')208@hooks.hook('shared-db-relation-joined')
213@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
214 charm_func=check_optional_relations)
215def db_joined():209def db_joined():
216 if is_relation_made('pgsql-db'):210 if is_relation_made('pgsql-db'):
217 # error, postgresql is used211 # error, postgresql is used
@@ -230,8 +224,6 @@
230224
231225
232@hooks.hook('pgsql-db-relation-joined')226@hooks.hook('pgsql-db-relation-joined')
233@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
234 charm_func=check_optional_relations)
235def pgsql_db_joined():227def pgsql_db_joined():
236 if is_relation_made('shared-db'):228 if is_relation_made('shared-db'):
237 # raise error229 # raise error
@@ -270,8 +262,6 @@
270262
271263
272@hooks.hook('shared-db-relation-changed')264@hooks.hook('shared-db-relation-changed')
273@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
274 charm_func=check_optional_relations)
275@restart_on_change(restart_map())265@restart_on_change(restart_map())
276@synchronize_ca_if_changed()266@synchronize_ca_if_changed()
277def db_changed():267def db_changed():
@@ -295,8 +285,6 @@
295285
296286
297@hooks.hook('pgsql-db-relation-changed')287@hooks.hook('pgsql-db-relation-changed')
298@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
299 charm_func=check_optional_relations)
300@restart_on_change(restart_map())288@restart_on_change(restart_map())
301@synchronize_ca_if_changed()289@synchronize_ca_if_changed()
302def pgsql_db_changed():290def pgsql_db_changed():
@@ -496,8 +484,6 @@
496484
497485
498@hooks.hook('ha-relation-joined')486@hooks.hook('ha-relation-joined')
499@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
500 charm_func=check_optional_relations)
501def ha_joined(relation_id=None):487def ha_joined(relation_id=None):
502 cluster_config = get_hacluster_config()488 cluster_config = get_hacluster_config()
503 resources = {489 resources = {
@@ -559,8 +545,6 @@
559545
560546
561@hooks.hook('ha-relation-changed')547@hooks.hook('ha-relation-changed')
562@os_workload_status(CONFIGS, REQUIRED_INTERFACES,
563 charm_func=check_optional_relations)
564@restart_on_change(restart_map())548@restart_on_change(restart_map())
565@synchronize_ca_if_changed()549@synchronize_ca_if_changed()
566def ha_changed():550def ha_changed():
@@ -645,6 +629,8 @@
645 hooks.execute(sys.argv)629 hooks.execute(sys.argv)
646 except UnregisteredHookError as e:630 except UnregisteredHookError as e:
647 log('Unknown hook {} - skipping.'.format(e))631 log('Unknown hook {} - skipping.'.format(e))
632 set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
633 charm_func=check_optional_relations)
648634
649635
650if __name__ == '__main__':636if __name__ == '__main__':

Subscribers

People subscribed via source and target branches