Skip to content
Snippets Groups Projects
Commit 1423eb66 authored by israelad's avatar israelad
Browse files

Stop checking config if ssh verification fails


If the ssh verification fails, don't continue checking the config. This
could potentially lead to a condition where the charm thinks it's ready
when it's not.

Signed-off-by: default avatarAdam Israel <adam.israel@canonical.com>
parent 4252d44a
No related branches found
No related tags found
No related merge requests found
......@@ -26,14 +26,17 @@ cfg = config()
@when_not('pingpong.configured')
def not_configured():
"""Check the current configuration.
Check the current values in config to see if we have enough
information to continue."""
information to continue.
"""
config_changed()
@when('config.changed', 'sshproxy.configured')
def config_changed():
"""Verify the configuration.
Verify that the charm has been configured
"""
status_set('maintenance', 'Verifying configuration data...')
......@@ -42,6 +45,7 @@ def config_changed():
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')
......
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