Skip to content
Snippets Groups Projects
Commit 15474010 authored by israelad's avatar israelad Committed by marchettim
Browse files

Add exception handling during config-changed hook


Signed-off-by: default avatarAdam Israel <adam.israel@canonical.com>
parent 24aaf3eb
No related branches found
No related tags found
No related merge requests found
......@@ -39,19 +39,26 @@ def config_changed():
Verify that the charm has been configured
"""
status_set('maintenance', 'Verifying configuration data...')
(validated, output) = charms.sshproxy.verify_ssh_credentials()
if not validated:
status_set('blocked', 'Unable to verify SSH credentials: {}'.format(
output
))
return
if all(k in cfg for k in ['mode']):
if cfg['mode'] in ['ping', 'pong']:
set_flag('pingpong.configured')
status_set('active', 'ready!')
try:
status_set('maintenance', 'Verifying configuration data...')
(validated, output) = charms.sshproxy.verify_ssh_credentials()
if not validated:
status_set('blocked', 'Unable to verify SSH credentials: {}'.format(
output
))
return
status_set('blocked', 'Waiting for configuration')
if all(k in cfg for k in ['mode']):
if cfg['mode'] in ['ping', 'pong']:
set_flag('pingpong.configured')
status_set('active', 'ready!')
return
status_set('blocked', 'Waiting for configuration')
except Exception as err:
status_set('blocked', 'Waiting for valid configuration ({})'.format(err))
@when('config.changed')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment