projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop checking config if ssh verification fails
[osm/devops.git]
/
juju-charms
/
layers
/
pingpong
/
reactive
/
pingpong.py
diff --git
a/juju-charms/layers/pingpong/reactive/pingpong.py
b/juju-charms/layers/pingpong/reactive/pingpong.py
index
701d9e2
..
ae18076
100755
(executable)
--- a/
juju-charms/layers/pingpong/reactive/pingpong.py
+++ b/
juju-charms/layers/pingpong/reactive/pingpong.py
@@
-26,14
+26,17
@@
cfg = config()
@when_not('pingpong.configured')
def not_configured():
"""Check the current configuration.
@when_not('pingpong.configured')
def not_configured():
"""Check the current configuration.
+
Check the current values in config to see if we have enough
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.
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...')
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
))
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')
if all(k in cfg for k in ['mode']):
if cfg['mode'] in ['ping', 'pong']:
set_flag('pingpong.configured')