projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix juju status in OSM Charms
[osm/devops.git]
/
installers
/
charm
/
ui-k8s
/
reactive
/
ui.py
diff --git
a/installers/charm/ui-k8s/reactive/ui.py
b/installers/charm/ui-k8s/reactive/ui.py
index
46e5709
..
5ca8143
100644
(file)
--- a/
installers/charm/ui-k8s/reactive/ui.py
+++ b/
installers/charm/ui-k8s/reactive/ui.py
@@
-38,12
+38,14
@@
def restart():
@when_not("mysql.available")
@when_not("ui-k8s.configured")
@when_not("mysql.available")
@when_not("ui-k8s.configured")
+@when("leadership.is_leader")
def waiting_for_mysql():
layer.status.waiting("Waiting for mysql to be available")
@when_not("nbi.ready")
@when_not("ui-k8s.configured")
def waiting_for_mysql():
layer.status.waiting("Waiting for mysql to be available")
@when_not("nbi.ready")
@when_not("ui-k8s.configured")
+@when("leadership.is_leader")
def waiting_for_nbi():
layer.status.waiting("Waiting for nbi to be available")
def waiting_for_nbi():
layer.status.waiting("Waiting for nbi to be available")
@@
-74,6
+76,12
@@
def configure():
layer.status.blocked("k8s spec failed to deploy: {}".format(e))
layer.status.blocked("k8s spec failed to deploy: {}".format(e))
+@when("mysql.available", "nbi.ready")
+@when_not("leadership.is_leader")
+def non_leaders_active():
+ layer.status.active("ready")
+
+
@when("ui-k8s.configured")
def set_ui_active():
layer.status.active("ready")
@when("ui-k8s.configured")
def set_ui_active():
layer.status.active("ready")