X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fui-k8s%2Freactive%2Fui.py;h=eb53daf2f71fe7af853198a7ec137e744a65ea33;hb=cda4fbcc6ca2002b85303df528c711c7ca174c3b;hp=46e5709432b7432ff8a6e8692754428074fa9f7a;hpb=47cd3b277310d5d6fef0067f220e849bebff35b4;p=osm%2Fdevops.git

diff --git a/installers/charm/ui-k8s/reactive/ui.py b/installers/charm/ui-k8s/reactive/ui.py
index 46e57094..eb53daf2 100644
--- 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("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")
+@when("leadership.is_leader")
 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))
 
 
+@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")
@@ -103,7 +111,6 @@ def make_pod_spec(
 
     data = {
         "name": md.get("name"),
-        "docker_image": cfg.get("image"),
         "mysql_host": mysql_host,
         "mysql_port": mysql_port,
         "mysql_user": mysql_user,